[FFmpeg-cvslog] Revert "ffmpeg: set pkt_timebase"

Nicolas George git at videolan.org
Thu Jul 19 23:56:00 CEST 2012


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sun Jul 15 16:09:01 2012 +0200| [d853ed46b1732c80016e0dbae83810104a84ed32] | committer: Nicolas George

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d853ed46b1732c80016e0dbae83810104a84ed32
---

 ffmpeg.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 2d12241..9ef2b57 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,



More information about the ffmpeg-cvslog mailing list