]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8688d3a 9765549)
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)
* commit '9765549f551ff40869aee1a6492b6a976c86cfe9':
  mpegts: Forward the errors on mpeg4 objects parsing

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavformat/mpegts.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/mpegts.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.