diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-06-06 01:00:56 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-06-06 01:06:45 +0000 |
| commit | a28f4fd1ea45821100032403ebdac1c164b10007 (patch) | |
| tree | 62a18fd6525640efbd398d6e05bc944eefda3895 /libavcodec/flacdec.c | |
| parent | c59ce1c98e5fdcd3d00fa4980ec8516eb9cad2c4 (diff) | |
flacdec: don't call allocate_buffers() in init_thread_copy() when s->max_blocksize is 0
This is normal, and happens when no extradata was available at decoder
initialization.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index a7303d6d12..22f6651acf 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -574,7 +574,9 @@ static int init_thread_copy(AVCodecContext *avctx) FLACContext *s = avctx->priv_data; s->decoded_buffer = NULL; s->decoded_buffer_size = 0; - return allocate_buffers(s); + if (s->max_blocksize) + return allocate_buffers(s); + return 0; } static av_cold int flac_decode_close(AVCodecContext *avctx) |