diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-30 03:11:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-30 03:11:16 +0100 |
| commit | 3e5cd34cd01f889a841ae850bf7776b9e33082e9 (patch) | |
| tree | aa06e0a1ec2f426b48571eb5a0d86656c9a376a2 /libavcodec/xiph.c | |
| parent | b08ff07d8d9a4bd1c8785c22888e5a19a7da0861 (diff) | |
| parent | 038890740014dc33d2e2f04da7cf0a9da821264e (diff) | |
Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'
* commit '038890740014dc33d2e2f04da7cf0a9da821264e':
mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions