Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Oct 2013 10:24:13 +0000 (12:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Oct 2013 10:24:13 +0000 (12:24 +0200)
commit4634871b513cc3eef74087e04ce0c542bdd2c393
treebd833c6e6ce3178088cd5f3af6c4e279ecd52267
parentc86955d24a4311721bf72cce21ebb14460a02ef9
parent90e15e340d97aebb5d2318020b5a516804d4c7c1
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggparsevorbis: return meaningful errors

Conflicts:
libavformat/oggparsevorbis.c

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