diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-13 12:32:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-13 12:34:18 +0100 |
| commit | 3e2714992b5023260ebfafd5d8f7d4cd0e2bdd80 (patch) | |
| tree | 81b173c79aa35988f07637623c1bb9aa09463dac /libavformat/filmstripenc.c | |
| parent | c74b3983f99a2a177904bd0b997528c1185e1231 (diff) | |
| parent | eea769df322fac2601a96db195fa7dc8d12a8fbc (diff) | |
| download | ffmpeg-3e2714992b5023260ebfafd5d8f7d4cd0e2bdd80.tar.gz | |
Merge commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc'
* commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc':
hevc: Use generic av_clip function, not C implementation
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/filmstripenc.c')
0 files changed, 0 insertions, 0 deletions