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)
commitf626eaa58e69532ff85044007b2ceb3ce8dd5ed2
tree46c9bb4e77048fc440a251c7b622de6af1410852
parent38c4316fff74ce51752ddb3722df619ecd2e8de6
parent63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2
Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'

* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
  aac_adtstoasc_bsf: Return proper error code

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