[FFmpeg-cvslog] Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 11:54:46 2013 +0100| [d57a6fe6abdab934063b809e43096bf887d01696] | committer: Michael Niedermayer

Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'

* commit '0749314886390f6ec81d45e0ba424fcb36c945cf':
  h263: Return meaningful errors

Conflicts:
	libavcodec/h263dec.c

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

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