diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:27:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:33:17 +0100 |
| commit | db7580b4f6b2217917aa6f372e3a18dfca43624a (patch) | |
| tree | 5643ab3c87daf3cd59e2a873ecc08c2f950d6626 /libavcodec/mpeg4video.h | |
| parent | 85d3bc33b1c19726a481143b2515fa86383e0a72 (diff) | |
| parent | a097f0049b28dc3ed13625e4a42619292c92492f (diff) | |
| download | ffmpeg-db7580b4f6b2217917aa6f372e3a18dfca43624a.tar.gz | |
Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'
* commit 'a097f0049b28dc3ed13625e4a42619292c92492f':
mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
0 files changed, 0 insertions, 0 deletions