[FFmpeg-cvslog] Merge commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9'
Michael Niedermayer
git at videolan.org
Sat Aug 9 20:40:58 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 9 20:32:38 2014 +0200| [adba796eb4a5373d781e093988f9aa0c3418c6b6] | committer: Michael Niedermayer
Merge commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9'
* commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9':
hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled
Conflicts:
libavcodec/hevc.c
See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adba796eb4a5373d781e093988f9aa0c3418c6b6
---
More information about the ffmpeg-cvslog
mailing list