Do not overwrite the sample format with AV_SAMPLE_FMT_NONE in libspeex_decode_init().
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Fri, 30 May 2014 05:38:19 +0000 (07:38 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Fri, 30 May 2014 05:38:19 +0000 (07:38 +0200)
Fixes a regression since ef48ac65 when decoding speex in f4v, reported
by irc user massdos.

libavcodec/libspeexdec.c

index 53e06d9..5e149a5 100644 (file)
@@ -43,7 +43,6 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
     SpeexHeader *header = NULL;
     int spx_mode;
 
-    avctx->sample_fmt = AV_SAMPLE_FMT_NONE;
     if (avctx->extradata && avctx->extradata_size >= 80) {
         header = speex_packet_to_header(avctx->extradata,
                                         avctx->extradata_size);