diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 22:01:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 22:01:45 +0200 |
| commit | 570397c7311554f47d36574107e3d27cd53ec406 (patch) | |
| tree | dcfe42903c3fd2b0b5a9b4c18bc1bed311dc5e13 /libavfilter/vf_curves.c | |
| parent | 9c41b59423bbb86685c05bcf3ef9d4a7efb54f34 (diff) | |
| parent | e87f5e4e5f2e2e36b0b7826d708cda7049877af0 (diff) | |
| download | ffmpeg-570397c7311554f47d36574107e3d27cd53ec406.tar.gz | |
Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'
* commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0':
h264: fully check cropping amount from sps
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_curves.c')
0 files changed, 0 insertions, 0 deletions