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)
* 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>
1  2 
libavcodec/h264.c
libavcodec/vorbisdec.c

Simple merge
Simple merge