Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 19:17:40 +0000 (20:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 19:21:16 +0000 (20:21 +0100)
commit2d37c57f3e9d58916b1247e0f335065415ce1364
treef5873fa404731ec2cbf3a94b0f8fa8f0a73644e9
parente48ff13ba722f2ac37681eeea1b7813292ac87fa
parentfe99c52fa99e44961a09cd1324aefd492b797fc8
Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'

* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
  mp3: Properly use AVCodecContext API

Conflicts:
libavformat/mp3dec.c

See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mp3dec.c