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)
* commit '44386aaad870cbd80ae0d08247ebc663476446ff':
  cdg: Forward error from avio_size() in read_header() function

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

Simple merge