[FFmpeg-cvslog] Do not overwrite the sample format with AV_SAMPLE_FMT_NONE in libspeex_decode_init ().

Carl Eugen Hoyos git at videolan.org
Fri May 30 12:57:39 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri May 30 07:38:19 2014 +0200| [ca2ec98cbe1f0e690cac6f6a8c9b9fedd58c10f5] | committer: Carl Eugen Hoyos

Do not overwrite the sample format with AV_SAMPLE_FMT_NONE in libspeex_decode_init().

Fixes a regression since ef48ac65 when decoding speex in f4v, reported
by irc user massdos.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca2ec98cbe1f0e690cac6f6a8c9b9fedd58c10f5
---

 libavcodec/libspeexdec.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
index 53e06d9..5e149a5 100644
--- a/libavcodec/libspeexdec.c
+++ b/libavcodec/libspeexdec.c
@@ -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);



More information about the ffmpeg-cvslog mailing list