Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 22:27:09 +0000 (23:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 22:27:09 +0000 (23:27 +0100)
commitbe493ca2a8c4e3a1c147f172cd6ace8673d36f84
tree7dc499db9fc0ec37ecf82c550ef6a4453c776230
parentbcaf64b605442e1622d16da89d4ec0e7730b8a8c
parentc10da30d8426a1f681d99a780b6e311f7fb4e5c5
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@gmx.at>
libavcodec/h264.c
libavcodec/vorbisdec.c