Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 18:51:31 +0000 (20:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 18:51:44 +0000 (20:51 +0200)
* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
  aac_adtstoasc_bsf: Return proper error code

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

Simple merge