[FFmpeg-cvslog] Merge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84'
Michael Niedermayer
git at videolan.org
Sat Aug 9 22:16:47 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 9 21:49:55 2014 +0200| [499ff6a052591d980ed36e10ac2019cef14c302b] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=499ff6a052591d980ed36e10ac2019cef14c302b
---
More information about the ffmpeg-cvslog
mailing list