diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:26:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:38:01 +0100 |
| commit | ca95d1b32df1a059be48404a3f1f598725a64d03 (patch) | |
| tree | f1ef2b5cd7798d66f9b5a8c0bd7c6367e9d92615 /libavcodec/wmaprodec.c | |
| parent | 6ddda83c3f9334511e606d4548a8f13816b71184 (diff) | |
| parent | 7d8482640058d66867602a6f58446c9342d9d146 (diff) | |
| download | ffmpeg-ca95d1b32df1a059be48404a3f1f598725a64d03.tar.gz | |
Merge commit '7d8482640058d66867602a6f58446c9342d9d146'
* commit '7d8482640058d66867602a6f58446c9342d9d146':
cavs: deMpegEncContextize
Note, the bugfixes have all been in FFmpeg previously, this just switches away
from MpegEncContext
Conflicts:
libavcodec/cavs.c
libavcodec/cavsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaprodec.c')
0 files changed, 0 insertions, 0 deletions