[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct  6 12:24:13 2013 +0200| [4634871b513cc3eef74087e04ce0c542bdd2c393] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggparsevorbis: return meaningful errors

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4634871b513cc3eef74087e04ce0c542bdd2c393
---