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)
* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
  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

@@@ -76,13 -71,12 +77,14 @@@ static int mp3_read_probe(AVProbeData *
  
      for(; buf < end; buf= buf2+1) {
          buf2 = buf;
 +        if(ff_mpa_check_header(AV_RB32(buf2)))
 +            continue;
  
          for(frames = 0; buf2 < end; frames++) {
 +            int dummy;
              header = AV_RB32(buf2);
-             fsize = avpriv_mpa_decode_header(avctx, header, &dummy, &dummy, &dummy, &dummy);
 -            fsize = avpriv_mpa_decode_header(avctx, header, &sample_rate,
 -                                             &sample_rate, &sample_rate,
 -                                             &sample_rate);
++            fsize = avpriv_mpa_decode_header(avctx, header,
++                                             &dummy, &dummy, &dummy, &dummy);
              if(fsize < 0)
                  break;
              buf2 += fsize;