ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Nov 17
12:01:47 2014 +0100| [c23d7de22ec0c14ad35d40c9073451c64a5ce74d] | committer:
Michael Niedermayer
Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'
* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8':
hevc: further 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=c23d7de22ec0c14ad35d40c9073451c64a5ce74d
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
