Merge commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 18:57:41 +0000 (18:57 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:01:05 +0000 (19:01 +0000)
commit2ec66ff83d00c3dbef06616e86994bb33d319202
tree7818b54771590bc1a35e3a00fc512853bcf1dedd
parentc4ed21367559ec56a5e2d5197f930a871a86a510
parentcdbaa436042ba59c3b2bd7e9652e9a14136fd604
Merge commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604'

* commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604':
  mpeg12dec: Always close reader on error

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