diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:41:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:41:17 +0100 |
| commit | 0f8bb0efc3cf9e2b86c7e518f24133ea358566d5 (patch) | |
| tree | dacb1546d0e82b1f27766c419b5dfddc877b42a5 /libavformat/dsicin.c | |
| parent | 8bdcec31116594b07e83a8845b64a5e8172884f2 (diff) | |
| parent | 5bf3c0fa49afd5bbf43aa841ff78007d72c80736 (diff) | |
| download | ffmpeg-0f8bb0efc3cf9e2b86c7e518f24133ea358566d5.tar.gz | |
Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'
* commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736':
h264: drop the now unused per-slice H264Contexts
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dsicin.c')
0 files changed, 0 insertions, 0 deletions