Revision 3438d82d ffmpeg.c

View differences:

ffmpeg.c
427 427
{
428 428
    int i, err;
429 429
    AVFormatContext *ic;
430
    int nopts = 0;
430 431

  
431 432
    err = av_open_input_file(&ic, filename, NULL, FFM_PACKET_SIZE, NULL);
432 433
    if (err < 0)
......
442 443
        st->codec = avcodec_alloc_context();
443 444
        memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext));
444 445
        s->streams[i] = st;
446
        if(st->codec->flags & CODEC_FLAG_BITEXACT)
447
            nopts = 1;
445 448
    }
446 449

  
450
    if (!nopts)
451
        s->timestamp = av_gettime();
452

  
447 453
    av_close_input_file(ic);
448 454
    return 0;
449 455
}
......
2177 2183
    }
2178 2184
}
2179 2185

  
2180
extern int ffm_nopts;
2181

  
2182 2186
static int opt_default(const char *opt, const char *arg){
2183 2187
    int type;
2184 2188
    const AVOption *o= NULL;
......
2210 2214
    opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1));
2211 2215
    opt_names[opt_name_count++]= o->name;
2212 2216

  
2213
#ifdef CONFIG_FFM_MUXER
2214
    /* disable generate of real time pts in ffm (need to be supressed anyway) */
2215
    if(avctx_opts[0]->flags & CODEC_FLAG_BITEXACT)
2216
        ffm_nopts = 1;
2217
#endif
2218

  
2219 2217
    if(avctx_opts[0]->debug)
2220 2218
        av_log_set_level(AV_LOG_DEBUG);
2221 2219
    return 0;

Also available in: Unified diff