[FFmpeg-cvslog] Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  6 23:27:09 2013 +0100| [be493ca2a8c4e3a1c147f172cd6ace8673d36f84] | committer: Michael Niedermayer

Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'

* commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5':
  shorten: set invalid channels count to 0
  vorbisdec: check memory allocations
  h264: check for luma and chroma bit dept being equal

Conflicts:
	libavcodec/shorten.c

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

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