diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 23:16:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 23:16:36 +0100 |
| commit | fa7c08d5e192aea77fdfb7f52c44c196a3ba4452 (patch) | |
| tree | 7089b439143302515c4f0339b617b0e88004a6cd /libavcodec/proresdec2.c | |
| parent | a6cb0534e2b5e91c119c77165bc65a6ff14e649b (diff) | |
| parent | c28ed1d743443e783537d279ae721be3bbdf7646 (diff) | |
| download | ffmpeg-fa7c08d5e192aea77fdfb7f52c44c196a3ba4452.tar.gz | |
Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'
* commit 'c28ed1d743443e783537d279ae721be3bbdf7646':
h264: move [uv]linesize to the per-slice context
Conflicts:
libavcodec/h264_mb.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdec2.c')
0 files changed, 0 insertions, 0 deletions