diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 21:15:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 21:16:33 +0100 |
| commit | 06219db9351cc2862913edb486ecc1573523502d (patch) | |
| tree | e70af13e4d6aa52de3ac52c21f302a4ddb832c1b /libavfilter/vf_cropdetect.c | |
| parent | 26568c04a8270ad792f3b86223914095b178b3a8 (diff) | |
| parent | ed06e5d92b4c67b49068d538461fbbe0a53a8c5e (diff) | |
| download | ffmpeg-06219db9351cc2862913edb486ecc1573523502d.tar.gz | |
Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'
* commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e':
hevc: Do not turn 32bit timebases into negative numbers
Conflicts:
libavcodec/hevc.c
See: bf2ce19e51fde57727a4ee33a4b3c2622f37a5c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_cropdetect.c')
0 files changed, 0 insertions, 0 deletions