diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:14:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:14:21 +0100 |
| commit | 0506cc2cc3e95b280609fe4e4c3b96e839e37d57 (patch) | |
| tree | cce8456b6edba1523468775f1981c411f3516080 | |
| parent | 3b2b07397c41dce79d0bb0ecad6321e7349c00b7 (diff) | |
| parent | 281a40e18f923510f2067d05c5b0cf08cc49dfee (diff) | |
| download | ffmpeg-0506cc2cc3e95b280609fe4e4c3b96e839e37d57.tar.gz | |
Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'
* commit '281a40e18f923510f2067d05c5b0cf08cc49dfee':
lavf: remove an unneeded call to avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 589eb532f2..6dc941bd1d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2503,7 +2503,6 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, AVPacket *avpkt, A !has_decode_delay_been_guessed(st) || (!st->codec_info_nb_frames && st->codec->codec->capabilities & CODEC_CAP_CHANNEL_CONF))) { got_picture = 0; - avcodec_get_frame_defaults(frame); switch(st->codec->codec_type) { case AVMEDIA_TYPE_VIDEO: ret = avcodec_decode_video2(st->codec, frame, |