Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

* commit '84f131921ffb43d8070d5680e91f6a24d66ccac4': avplay: do not call avcodec_get_frame_defaults(). Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 5a15bd6f2f
parent 27e7977982 84f131921f
commit 5a15bd6f2f
1 changed files with 0 additions and 1 deletions
--- a/ffplay.c
+++ b/ffplay.c
@ -2167,7 +2167,6 @@ static int audio_decode_frame(VideoState *is)
                    return AVERROR(ENOMEM);
            } else {
                av_frame_unref(is->frame);
-                avcodec_get_frame_defaults(is->frame);
            }

            if (is->audioq.serial != is->audio_pkt_temp_serial)