Commit 0506cc2c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '281a40e1'

* commit '281a40e1':
  lavf: remove an unneeded call to avcodec_get_frame_defaults().
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3b2b0739 281a40e1
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment