summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4video.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-30 03:11:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-30 03:11:16 +0100
commit3e5cd34cd01f889a841ae850bf7776b9e33082e9 (patch)
treeaa06e0a1ec2f426b48571eb5a0d86656c9a376a2 /libavcodec/mpeg4video.h
parentb08ff07d8d9a4bd1c8785c22888e5a19a7da0861 (diff)
parent038890740014dc33d2e2f04da7cf0a9da821264e (diff)
downloadffmpeg-3e5cd34cd01f889a841ae850bf7776b9e33082e9.tar.gz
Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'
* commit '038890740014dc33d2e2f04da7cf0a9da821264e': mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
-rw-r--r--libavcodec/mpeg4video.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 1c72abe723..d735a68fa2 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -76,6 +76,10 @@ typedef struct Mpeg4DecContext {
int divx_build;
int xvid_build;
int lavc_build;
+
+ int cplx_estimation_trash_i;
+ int cplx_estimation_trash_p;
+ int cplx_estimation_trash_b;
} Mpeg4DecContext;
/* dc encoding for mpeg4 */