Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Nov 2012 09:23:58 +0000 (10:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Nov 2012 09:26:40 +0000 (10:26 +0100)
* qatar/master:
  libopencore-amr: Check the return value of amr_decode_fix_avctx

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libopencore-amr.c

Simple merge