diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:37:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:37:55 +0100 |
| commit | 4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55 (patch) | |
| tree | 86c21a7454f7c1ffd7897b78b42280414d9e1ef0 /libavcodec/dvd_nav_parser.c | |
| parent | 97c8ecaadab4e246d969fadd44072025b64747e4 (diff) | |
| parent | ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6 (diff) | |
| download | ffmpeg-4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55.tar.gz | |
Merge commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6'
* commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6':
h264: move sub_mb_type into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvd_nav_parser.c')
0 files changed, 0 insertions, 0 deletions