[FFmpeg-cvslog] Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'

Michael Niedermayer git at videolan.org
Mon Jun 30 18:10:41 CEST 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 30 17:58:51 2014 +0200| [ae9a73de2a2fa47e54107765da0cd9b71b4ad8e3] | committer: Michael Niedermayer

Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'

* commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772':
  pgssubdec: handle more complex PGS scenarios


Some of this has been split out and commited in cleanly split patches immedeately
before this merge

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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

More information about the ffmpeg-cvslog mailing list