diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 18:50:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 18:50:32 +0200 |
| commit | 928b5708f94c50e8cb0b982208a2d097b0d588c2 (patch) | |
| tree | 142af652040c8eed9368fd54196798f4d5889626 /libavfilter/vf_pixdesctest.c | |
| parent | c1bc20bfd9f6ab2d2a3342a924938185404d7a4f (diff) | |
| parent | 34c5a6660a9e5e3cf301691bb29d011638953dc2 (diff) | |
| download | ffmpeg-928b5708f94c50e8cb0b982208a2d097b0d588c2.tar.gz | |
Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
h264: codec reinit: remove statements without effect
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_pixdesctest.c')
0 files changed, 0 insertions, 0 deletions