[FFmpeg-cvslog] Merge commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7'
Michael Niedermayer
git at videolan.org
Thu Jul 9 04:57:13 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 9 04:19:42 2015 +0200| [1d4194e69696e615b5bbf7273103b05241dc75b8] | committer: Michael Niedermayer
Merge commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7'
* commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7':
hevc_ps: split the code for parsing the SPS and exporting it into the context
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d4194e69696e615b5bbf7273103b05241dc75b8
---
More information about the ffmpeg-cvslog
mailing list