diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:30:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:36:57 +0100 |
| commit | 739edc1a7e83cdca27c3defbc3f057e98a3de472 (patch) | |
| tree | 6d7c29f22fd58077d5d20682bc73433179c55a0d /libavformat/amr.c | |
| parent | 35a788d953838c1b7f34038ef54fddc3d11994fe (diff) | |
| parent | bf03a878a76dea29b36f368759e9f66102b39a5f (diff) | |
| download | ffmpeg-streaming-739edc1a7e83cdca27c3defbc3f057e98a3de472.zip ffmpeg-streaming-739edc1a7e83cdca27c3defbc3f057e98a3de472.tar.gz | |
Merge commit 'bf03a878a76dea29b36f368759e9f66102b39a5f'
* commit 'bf03a878a76dea29b36f368759e9f66102b39a5f':
h264: move mb[_{padding,luma_dc}] into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_mb.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/amr.c')
0 files changed, 0 insertions, 0 deletions
