diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:33:33 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:36:48 +0400 |
commit | 9517900bef528527d8507da5a1992f99513d71b4 (patch) | |
tree | 7014e6c67734c3d51c2bb23e06e0c6630ccdeca4 /libavcodec/h264_cavlc.c | |
parent | 3e5833802ec711b2ffde3137374170a650d67abc (diff) | |
parent | e0c16e4e3259cf50b5bac4c23bb6e517f397c74b (diff) |
Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'
* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
mpegvideo: move mpegvideo formats-related defines to mpegutils.h
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_mvpred.h
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cavlc.c')
-rw-r--r-- | libavcodec/h264_cavlc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index a06203bac5..25a0c0ae19 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -35,6 +35,7 @@ #include "h264data.h" // FIXME FIXME FIXME #include "h264_mvpred.h" #include "golomb.h" +#include "mpegutils.h" #include "libavutil/avassert.h" |