Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 09:35:29 +0000 (10:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 09:35:29 +0000 (10:35 +0100)
commit0b9e480b8f3be266acf708bbab80d53bb7f48b7d
treef705c39bd3e004e67bf15dbf9a9a09ee105df87f
parent70737b83f06e34a8b4f9eb70948b2f2ca6711992
parent5e5fb21877d8da7b3b8a27bb4d6a070d210c152d
Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'

* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
  oggparsetheora: return meaningful error codes

Conflicts:
libavformat/oggparsetheora.c

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