[FFmpeg-cvslog] Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 15 13:41:06 2012 +0100| [f186ecc164e8dad145d4637ac1d55b66e460af7a] | committer: Michael Niedermayer

Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'

* commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d':
  vp56: make parse_header return standard error codes

Conflicts:
	libavcodec/vp56.c

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

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