aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-12-03 12:00:32 +0100
committerAnton Khirnov <anton@khirnov.net>2013-12-11 20:39:54 +0100
commit674fa49110a661694188a958be13d529b7c8c5dd (patch)
tree407fb85966911af0d8f7bc2fb4acadc4c6dae33a
parent943135621830ac3857d3cf766cfc280a95bb3c13 (diff)
downloadffmpeg-674fa49110a661694188a958be13d529b7c8c5dd.tar.gz
avconv: do not call avcodec_get_frame_defaults()
Strictly speaking it is not correct to call it on refcounted frames, in any case it is unnecessary, since filtered_frame is always unreferenced after poll_filter() returns.
-rw-r--r--avconv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/avconv.c b/avconv.c
index 0cbbcb1ff2..17dc468f6b 100644
--- a/avconv.c
+++ b/avconv.c
@@ -642,8 +642,7 @@ static int poll_filter(OutputStream *ost)
if (!ost->filtered_frame && !(ost->filtered_frame = av_frame_alloc())) {
return AVERROR(ENOMEM);
- } else
- avcodec_get_frame_defaults(ost->filtered_frame);
+ }
filtered_frame = ost->filtered_frame;
if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&