From 648e41b342595ab11770ac99aa405971568d86d2 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 21 May 2010 07:08:29 +0000 Subject: Take ff_write_chained in use in the mov rtp hinter and in the rtsp muxer Originally committed as revision 23208 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/movenchint.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'libavformat/movenchint.c') diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c index d90ac67911..2ebe8b808f 100644 --- a/libavformat/movenchint.c +++ b/libavformat/movenchint.c @@ -21,6 +21,7 @@ #include "movenc.h" #include "libavutil/intreadwrite.h" +#include "internal.h" int ff_mov_init_hinting(AVFormatContext *s, int index, int src_index) { @@ -430,7 +431,6 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, int size; ByteIOContext *hintbuf = NULL; AVPacket hint_pkt; - AVPacket local_pkt; int ret = 0, count; if (!rtp_ctx) @@ -441,15 +441,7 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, sample_queue_push(&trk->sample_queue, pkt, sample); /* Feed the packet to the RTP muxer */ - local_pkt = *pkt; - local_pkt.stream_index = 0; - local_pkt.pts = av_rescale_q(pkt->pts, - s->streams[pkt->stream_index]->time_base, - rtp_ctx->streams[0]->time_base); - local_pkt.dts = av_rescale_q(pkt->dts, - s->streams[pkt->stream_index]->time_base, - rtp_ctx->streams[0]->time_base); - av_write_frame(rtp_ctx, &local_pkt); + ff_write_chained(rtp_ctx, 0, pkt, s); /* Fetch the output from the RTP muxer, open a new output buffer * for next time. */ -- cgit v1.2.3