Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Aug 2011 22:32:11 +0000 (00:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Aug 2011 22:32:19 +0000 (00:32 +0200)
commit6c4e9cae5223c88ad98cd184d4a7e6a019bdd586
tree3c8e34592fb6a6dbd905b1930e5722569fa1febf
parent4646ef87b1f55ab07a59e1f282d75c9b03747798
parentb2700a5c7c073482c763dcb64692d7e0353b60b0
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: fix misspelling in comment
  aac: propagate error return values for AV_LOG_ERROR-triggering events

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