Revision db46c4e1

View differences:

libavformat/utils.c
315 315
    return av_probe_input_format2(pd, is_opened, &score);
316 316
}
317 317

  
318
static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
318
static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, AVProbeData *pd, int score)
319 319
{
320 320
    AVInputFormat *fmt;
321 321
    fmt = av_probe_input_format2(pd, 1, &score);
322 322

  
323 323
    if (fmt) {
324
        av_log(s, AV_LOG_DEBUG, "Probe with size=%d, packets=%d detected %s with score=%d\n",
325
               pd->buf_size, MAX_PROBE_PACKETS - st->probe_packets, fmt->name, score);
324 326
        if (!strcmp(fmt->name, "mp3")) {
325 327
            st->codec->codec_id = CODEC_ID_MP3;
326 328
            st->codec->codec_type = CODEC_TYPE_AUDIO;
......
595 597
            memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);
596 598

  
597 599
            if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){
598
                set_codec_from_probe_data(st, pd, 1);
600
                set_codec_from_probe_data(s, st, pd, 1);
599 601
                if(st->codec->codec_id != CODEC_ID_PROBE){
600 602
                    pd->buf_size=0;
601 603
                    av_freep(&pd->buf);

Also available in: Unified diff