Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:49:44 +0000 (23:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:49:44 +0000 (23:49 +0100)
* commit '84f131921ffb43d8070d5680e91f6a24d66ccac4':
  avplay: do not call avcodec_get_frame_defaults().

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffplay.c

index 4893ebc..0b5331b 100644 (file)
--- 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)