summaryrefslogtreecommitdiff
path: root/libavcodec/ratecontrol.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-17 12:33:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-17 12:36:48 +0100
commit9517900bef528527d8507da5a1992f99513d71b4 (patch)
tree7014e6c67734c3d51c2bb23e06e0c6630ccdeca4 /libavcodec/ratecontrol.c
parent3e5833802ec711b2ffde3137374170a650d67abc (diff)
parente0c16e4e3259cf50b5bac4c23bb6e517f397c74b (diff)
downloadffmpeg-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/ratecontrol.c')
-rw-r--r--libavcodec/ratecontrol.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 7db248ecf5..29913e71b8 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -28,6 +28,7 @@
#include "libavutil/attributes.h"
#include "avcodec.h"
#include "ratecontrol.h"
+#include "mpegutils.h"
#include "mpegvideo.h"
#include "libavutil/eval.h"