aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-09-23 12:46:05 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-25 08:28:10 +0200
commit240ae356e9c12c9b56e58e9245a58f3716815d13 (patch)
tree0e90a937c7fa242383c1c619cceb5cc62b413c68
parent2b4e49d4281690db67073ba644ad2ffc17767cdf (diff)
downloadffmpeg-240ae356e9c12c9b56e58e9245a58f3716815d13.tar.gz
avconv: remove fake coded_frame on streamcopy hack
Back in 2002 when it was added, some muxers used information from coded_frame. It's not true anymore, so this hack is useless and can be removed.
-rw-r--r--avconv.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/avconv.c b/avconv.c
index fb744bd537..43792e119b 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1755,7 +1755,6 @@ static int output_packet(InputStream *ist, int ist_index,
abort();
}
} else {
- AVFrame avframe; //FIXME/XXX remove this
AVPacket opkt;
int64_t ost_tb_start_time= av_rescale_q(of->start_time, AV_TIME_BASE_Q, ost->st->time_base);
@@ -1771,10 +1770,6 @@ static int output_packet(InputStream *ist, int ist_index,
/* no reencoding needed : output the packet directly */
/* force the input stream PTS */
- avcodec_get_frame_defaults(&avframe);
- ost->st->codec->coded_frame= &avframe;
- avframe.key_frame = pkt->flags & AV_PKT_FLAG_KEY;
-
if(ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
audio_size += data_size;
else if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {