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)
* 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>
1  2 
libavcodec/aacdec.c
libavcodec/avcodec.h

Simple merge
Simple merge