aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-08-28 15:01:34 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-09-02 11:55:22 +0200
commitff1f5b407df8e8740eb6eeee83b202284f6ace7a (patch)
tree3662ed7308fa00566510ab3bbe2adf7eacb589fb
parentbddf1a647991e0dbacf657aa24d4227720cf2bca (diff)
downloadffmpeg-ff1f5b407df8e8740eb6eeee83b202284f6ace7a.tar.gz
avcodec/flacdec: Don't infer max_framesize unnecessarily
This field is not really used by the decoder at all: It is only output in some debug log message, but this debug log message should better use the value read from the streaminfo instead of a second-guessed value from the decoder. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/flacdec.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index d03369eb6d..3b16426e73 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -565,12 +565,6 @@ static int flac_decode_frame(AVCodecContext *avctx, AVFrame *frame,
*got_frame_ptr = 0;
- if (s->stream_info.max_framesize == 0) {
- s->stream_info.max_framesize =
- ff_flac_get_max_frame_size(s->stream_info.max_blocksize ? s->stream_info.max_blocksize : FLAC_MAX_BLOCKSIZE,
- FLAC_MAX_CHANNELS, 32);
- }
-
if (buf_size > 5 && !memcmp(buf, "\177FLAC", 5)) {
av_log(s->avctx, AV_LOG_DEBUG, "skipping flac header packet 1\n");
return buf_size;