Merge commit '78a3a4580c5a547af4ae8682c662ea3a4699a599' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:25:47 +0000 (20:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:25:58 +0000 (20:25 +0200)
* commit '78a3a4580c5a547af4ae8682c662ea3a4699a599':
  mp3: Properly use AVCodecContext API

Conflicts:
libavformat/mp3dec.c

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

@@@ -81,7 -74,9 +82,8 @@@ static int mp3_read_probe(AVProbeData *
  
          for(frames = 0; buf2 < end; frames++) {
              header = AV_RB32(buf2);
-             fsize = avpriv_mpa_decode_header(avctx, header, &sample_rate, &sample_rate, &sample_rate, &sample_rate);
 -            fsize = avpriv_mpa_decode_header(avctx, header, &sample_rate,
 -                                             &sample_rate, &sample_rate,
 -                                             &sample_rate);
++            fsize = avpriv_mpa_decode_header(avctx, header,
++                                             &sample_rate, &sample_rate, &sample_rate, &sample_rate);
              if(fsize < 0)
                  break;
              buf2 += fsize;