From d853ed46b1732c80016e0dbae83810104a84ed32 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sun, 15 Jul 2012 16:09:01 +0200 Subject: [PATCH] Revert "ffmpeg: set pkt_timebase" This reverts commit 744bd8d08c18d68d92ead091c7e335b4b07459aa. pkt_timebase is now set by av_codec_set_pkt_timebase. If some demuxer set AVStream.time_base directly, it need to be fixed. There is a warning to detect it. --- ffmpeg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 2d12241a0a..9ef2b579ca 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2392,7 +2392,6 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) else avcodec_get_frame_defaults(ist->decoded_frame); decoded_frame = ist->decoded_frame; - av_codec_set_pkt_timebase(avctx, ist->st->time_base); update_benchmark(NULL); ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt); @@ -2515,7 +2514,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) avcodec_get_frame_defaults(ist->decoded_frame); decoded_frame = ist->decoded_frame; pkt->dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ist->st->time_base); - av_codec_set_pkt_timebase(ist->st->codec, ist->st->time_base); update_benchmark(NULL); ret = avcodec_decode_video2(ist->st->codec,