[FFmpeg-cvslog] Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 30 10:35:29 2013 +0100| [0b9e480b8f3be266acf708bbab80d53bb7f48b7d] | committer: Michael Niedermayer

Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'

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

Conflicts:
	libavformat/oggparsetheora.c

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

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