ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed
Jul 15 21:21:40 2015 +0200| [4e160ecdbc0561068f2e690f8e9ec714e28497d0] |
committer: Michael Niedermayer
Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'
* commit 'c88c5eef53ff1619724ba47b722da64ec0593dab':
hevc: Split the struct setup from the pps parsing
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e160ecdbc0561068f2e690f8e9ec714e28497d0
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
