diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 21:49:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 21:49:55 +0200 |
| commit | 499ff6a052591d980ed36e10ac2019cef14c302b (patch) | |
| tree | c67c2ba15ff01f43621ac552d5004fa06d866e1f /libswresample/arm | |
| parent | 5a3a83f01df05e829141d3da65995270e0e18a04 (diff) | |
| parent | 7acdd3a1275bcd9cad48f9632169f6bbaeb39d84 (diff) | |
| download | ffmpeg-499ff6a052591d980ed36e10ac2019cef14c302b.tar.gz | |
Merge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84'
* commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84':
hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()
Conflicts:
libavcodec/hevc_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/arm')
0 files changed, 0 insertions, 0 deletions