summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-10-23 08:32:56 +0200
committerAnton Khirnov <anton@khirnov.net>2012-10-24 08:46:45 +0200
commit8e84f2055c4170e502d36db3539b5e243a5b6cca (patch)
treefacc97f87c29f7fc4cd73b293f28c6b30b8a4067 /avconv.c
parent1bc64c2814d409d3cc129c27c493ee915bebdc4a (diff)
avconv: remove now unneeded calls to avcodec_get_frame_defaults().
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/avconv.c b/avconv.c
index 6f6771186a..bf1e2fac48 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1079,8 +1079,6 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
return AVERROR(ENOMEM);
- else
- avcodec_get_frame_defaults(ist->decoded_frame);
decoded_frame = ist->decoded_frame;
ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt);
@@ -1220,8 +1218,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
return AVERROR(ENOMEM);
- else
- avcodec_get_frame_defaults(ist->decoded_frame);
decoded_frame = ist->decoded_frame;
ret = avcodec_decode_video2(ist->st->codec,