1. ffmpeg
  2. Commit 5a15bd6f2f40253dbc5d4add783d29cbe673aa97
Browse code

Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

* commit '84f131921ffb43d8070d5680e91f6a24d66ccac4':
avplay: do not call avcodec_get_frame_defaults().

Conflicts:
ffplay.c

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

Michael Niedermayer authored on 2013/12/12 07:49:44
Showing 1 changed files
ffplay.c
History View file @ 5a15bd6
... ... 
@@ -2167,7 +2167,6 @@ static int audio_decode_frame(VideoState *is)
2167 2167 
                     return AVERROR(ENOMEM);
2168 2168 
             } else {
2169 2169 
                 av_frame_unref(is->frame);
2170 
-                avcodec_get_frame_defaults(is->frame);
2171 2170 
             }
2172 2171
2173 2172 
             if (is->audioq.serial != is->audio_pkt_temp_serial)