[FFmpeg-cvslog] Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'
Michael Niedermayer
git at videolan.org
Mon Nov 17 12:00:32 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 11:54:41 2014 +0100| [e078549421b2845799abe878fc2a60ec89399fcc] | committer: Michael Niedermayer
Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'
* commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139':
hevc: reduce code duplication in hls_prediction_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e078549421b2845799abe878fc2a60ec89399fcc
---
More information about the ffmpeg-cvslog
mailing list