OSDN Git Service

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)
commit5c7d86cbde71c3db566194096300ce052e026c38
treee71cfb21bace972c55302302fd12472a5e269c57
parent7a28a9f68e88f066ede77dc13a517c3c545d2a92
parent487b54104a01fa40a185a9a51e1cf41b2cf72367
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  omadec: fix bitrate for ATRAC3+ streams

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