]> git.sesse.net Git - ffmpeg/commit
Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 14 Apr 2016 13:01:31 +0000 (14:01 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 14 Apr 2016 13:01:31 +0000 (14:01 +0100)
commit0520d573db71171053a684b1b2fed0598df1641f
tree6ad174b73b0abe5d36af30765d9b17375c92820f
parent8688d3af39e8cd8848e74407998777dd5aad3863
parent9765549f551ff40869aee1a6492b6a976c86cfe9
Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'

* commit '9765549f551ff40869aee1a6492b6a976c86cfe9':
  mpegts: Forward the errors on mpeg4 objects parsing

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/mpegts.c