ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e078549421b2845799abe878fc2a60ec89399fcc
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
