Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jul 2014 22:49:52 +0000 (00:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jul 2014 23:03:50 +0000 (01:03 +0200)
commit20ad2152ddc2606b0869e80ebf0b5154f13c7934
tree93f73bddeda8eca8fc39b7cc4f7bd05b1edfdd1f
parentddea3b7106b1d003fb1fb774c0be05db1319926d
parent44386aaad870cbd80ae0d08247ebc663476446ff
Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'

* commit '44386aaad870cbd80ae0d08247ebc663476446ff':
  cdg: Forward error from avio_size() in read_header() function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/cdg.c