diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 21:44:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 21:44:40 +0100 |
| commit | eaaa5801efec0888a5ab243e9befd91163b79d06 (patch) | |
| tree | c60def7308f8fe751d19f68c82e25792245edd31 /libavfilter/vf_cropdetect.c | |
| parent | 06219db9351cc2862913edb486ecc1573523502d (diff) | |
| parent | 4d33873c2990b8d6096f60fef384f0efc4482b55 (diff) | |
| download | ffmpeg-eaaa5801efec0888a5ab243e9befd91163b79d06.tar.gz | |
Merge commit '4d33873c2990b8d6096f60fef384f0efc4482b55'
* commit '4d33873c2990b8d6096f60fef384f0efc4482b55':
hevc: make pps/sps ids unsigned where necessary
Conflicts:
libavcodec/hevc.h
libavcodec/hevc_ps.c
See: d1e6602665d5ec1b7e211ab27b298c26139f82cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_cropdetect.c')
0 files changed, 0 insertions, 0 deletions