[FFmpeg-cvslog] avformat/write_packet: drop disabled code

Michael Niedermayer git at videolan.org
Fri Apr 26 15:52:26 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 26 14:57:56 2013 +0200| [ba323d67fa5554e83a907ac81b623c0539e37e03] | committer: Michael Niedermayer

avformat/write_packet: drop disabled code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mux.c |   17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index eba4ec3..28e3060 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -529,23 +529,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
         av_assert2(pkt->dts == AV_NOPTS_VALUE || pkt->dts >= 0);
     }
 
-    if (!(s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS)) && 0) {
-        AVRational time_base = s->streams[pkt->stream_index]->time_base;
-        int64_t offset = 0;
-
-        if (!s->offset && pkt->dts != AV_NOPTS_VALUE && pkt->dts < 0) {
-            s->offset = -pkt->dts;
-            s->offset_timebase = time_base;
-        }
-        if (s->offset)
-            offset = av_rescale_q(s->offset, s->offset_timebase, time_base);
-
-        if (pkt->dts != AV_NOPTS_VALUE)
-            pkt->dts += offset;
-        if (pkt->pts != AV_NOPTS_VALUE)
-            pkt->pts += offset;
-    }
-
     did_split = av_packet_split_side_data(pkt);
     ret = s->oformat->write_packet(s, pkt);
     if (s->flush_packets && s->pb && s->pb->error >= 0)



More information about the ffmpeg-cvslog mailing list