Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Sep 2014 18:00:01 +0000 (20:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Sep 2014 18:09:01 +0000 (20:09 +0200)
commitddc6adaa280aecd973cc3cc1661f8bafe28738c8
treec22b0d45a9e930bf1d7d52f77d13d6dcf64d7695
parent5a20f1885d3b521afc8c63734cff724da0a87815
parent4d55e9de27894ddfb337b28cd7aa6d14a12666d2
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>
libavcodec/vc1.h
libavcodec/vc1_common.h
libavformat/movenc.c