diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2012-07-15 16:09:01 +0200 |
---|---|---|
committer | Nicolas George <nicolas.george@normalesup.org> | 2012-07-19 23:41:03 +0200 |
commit | d853ed46b1732c80016e0dbae83810104a84ed32 (patch) | |
tree | 08a2078674947ebe76d67936609e59254dda6915 | |
parent | 0e57d79b0cc576a49c4cc38a1aa5195ab334f687 (diff) | |
download | ffmpeg-d853ed46b1732c80016e0dbae83810104a84ed32.tar.gz |
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.
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -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, |