Michael Niedermayer ddc6adaa28 Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2' ...

* commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2':
  vc1: Split bits used in libavformat into a separate header

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-09-04 20:09:01 +02:00

2.4 KiB

Raw Blame History

View Raw