diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 20:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 20:09:01 +0200 |
| commit | ddc6adaa280aecd973cc3cc1661f8bafe28738c8 (patch) | |
| tree | c22b0d45a9e930bf1d7d52f77d13d6dcf64d7695 /libavformat/movenc.c | |
| parent | 5a20f1885d3b521afc8c63734cff724da0a87815 (diff) | |
| parent | 4d55e9de27894ddfb337b28cd7aa6d14a12666d2 (diff) | |
| download | ffmpeg-ddc6adaa280aecd973cc3cc1661f8bafe28738c8.tar.gz | |
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>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bf613911b7..021fe784e4 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -33,7 +33,7 @@ #include "avc.h" #include "libavcodec/get_bits.h" #include "libavcodec/put_bits.h" -#include "libavcodec/vc1.h" +#include "libavcodec/vc1_common.h" #include "libavcodec/raw.h" #include "internal.h" #include "libavutil/avstring.h" @@ -42,6 +42,7 @@ #include "libavutil/opt.h" #include "libavutil/dict.h" #include "libavutil/pixdesc.h" +#include "libavutil/timecode.h" #include "hevc.h" #include "rtpenc.h" #include "mov_chan.h" |