[FFmpeg-cvslog] Merge commit '33452aede6acab78f726cd1924824585f00765cc'
Michael Niedermayer
git at videolan.org
Wed Dec 11 23:14:48 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 11 23:05:04 2013 +0100| [12a4042445231a5032c9507f31d65a63d08aed1b] | committer: Michael Niedermayer
Merge commit '33452aede6acab78f726cd1924824585f00765cc'
* commit '33452aede6acab78f726cd1924824585f00765cc':
hevc: store the VPS list as an AVBufferRef, just like the others *PS
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c
See: 36658c978f5d7df2ce556075946f3a80f7eca753
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12a4042445231a5032c9507f31d65a63d08aed1b
---
More information about the ffmpeg-cvslog
mailing list