diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 12:33:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 12:36:48 +0100 |
| commit | 9517900bef528527d8507da5a1992f99513d71b4 (patch) | |
| tree | 7014e6c67734c3d51c2bb23e06e0c6630ccdeca4 /libavcodec/svq1enc.c | |
| parent | 3e5833802ec711b2ffde3137374170a650d67abc (diff) | |
| parent | e0c16e4e3259cf50b5bac4c23bb6e517f397c74b (diff) | |
| download | ffmpeg-9517900bef528527d8507da5a1992f99513d71b4.tar.gz | |
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/svq1enc.c')
| -rw-r--r-- | libavcodec/svq1enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 2d7e848fc7..a4cb279487 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -32,9 +32,10 @@ #include "mpegvideo.h" #include "h263.h" #include "internal.h" -#include "libavutil/avassert.h" +#include "mpegutils.h" #include "svq1.h" #include "svq1enc_cb.h" +#include "libavutil/avassert.h" typedef struct SVQ1Context { |