summaryrefslogtreecommitdiff
path: root/libavcodec/libspeexdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-05-30 07:38:19 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-05-30 07:38:19 +0200
commitca2ec98cbe1f0e690cac6f6a8c9b9fedd58c10f5 (patch)
tree3b05300bf2659fc72c9a774eeb4763afa1e0ad1e /libavcodec/libspeexdec.c
parent1acb5ca02a66122c47856e380cd1c11ee1ad6161 (diff)
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.
Diffstat (limited to 'libavcodec/libspeexdec.c')
-rw-r--r--libavcodec/libspeexdec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
index 53e06d9b9e..5e149a5d5c 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);