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)
commitcb395929e3793189403e473f208a669debe825d0
tree34b68bfb22ec7dec28d2ee1ffd5afeef6f358c80
parent7c2cfaac6a24d5767c0b2f3a21190e1777b8ff7d
parentad961726dc0bec7435aae7fbab10471b9063018b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopencore-amr: Check the return value of amr_decode_fix_avctx

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