Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Sep 2013 00:20:49 +0000 (02:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Sep 2013 00:21:41 +0000 (02:21 +0200)
* qatar/master:
  omadec: fix bitrate for ATRAC3+ streams

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

Simple merge