[FFmpeg-cvslog] Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'

Michael Niedermayer git at videolan.org
Wed Jul 15 21:29:02 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | 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 <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e160ecdbc0561068f2e690f8e9ec714e28497d0
---





More information about the ffmpeg-cvslog mailing list