[FFmpeg-cvslog] avcodec/flac: Remove unused parameter from ff_flac_is_extradata_valid()
Andreas Rheinhardt
git at videolan.org
Fri Sep 2 13:00:02 EEST 2022
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sun Aug 28 16:27:06 2022 +0200| [6699ed38f37d2b6a9512cf61b8f51a7c38ffc988] | committer: Andreas Rheinhardt
avcodec/flac: Remove unused parameter from ff_flac_is_extradata_valid()
format is write-only.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6699ed38f37d2b6a9512cf61b8f51a7c38ffc988
---
libavcodec/flac.c | 3 ---
libavcodec/flac.h | 6 ------
libavcodec/flacdec.c | 3 +--
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 03c7bfb9e6..1da8aed21b 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -146,7 +146,6 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
}
int ff_flac_is_extradata_valid(AVCodecContext *avctx,
- enum FLACExtradataFormat *format,
uint8_t **streaminfo_start)
{
if (!avctx->extradata || avctx->extradata_size < FLAC_STREAMINFO_SIZE) {
@@ -159,14 +158,12 @@ int ff_flac_is_extradata_valid(AVCodecContext *avctx,
av_log(avctx, AV_LOG_WARNING, "extradata contains %d bytes too many.\n",
FLAC_STREAMINFO_SIZE-avctx->extradata_size);
}
- *format = FLAC_EXTRADATA_FORMAT_STREAMINFO;
*streaminfo_start = avctx->extradata;
} else {
if (avctx->extradata_size < 8+FLAC_STREAMINFO_SIZE) {
av_log(avctx, AV_LOG_ERROR, "extradata too small.\n");
return 0;
}
- *format = FLAC_EXTRADATA_FORMAT_FULL_HEADER;
*streaminfo_start = &avctx->extradata[8];
}
return 1;
diff --git a/libavcodec/flac.h b/libavcodec/flac.h
index 239e842716..7d6286bf0f 100644
--- a/libavcodec/flac.h
+++ b/libavcodec/flac.h
@@ -55,11 +55,6 @@ enum {
FLAC_METADATA_TYPE_INVALID = 127
};
-enum FLACExtradataFormat {
- FLAC_EXTRADATA_FORMAT_STREAMINFO = 0,
- FLAC_EXTRADATA_FORMAT_FULL_HEADER = 1
-};
-
#define FLACCOMMONINFO \
int samplerate; /**< sample rate */\
int channels; /**< number of channels */\
@@ -106,7 +101,6 @@ int ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
* @return 1 if valid, 0 if not valid.
*/
int ff_flac_is_extradata_valid(AVCodecContext *avctx,
- enum FLACExtradataFormat *format,
uint8_t **streaminfo_start);
/**
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 3b16426e73..23e9eba4ad 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -94,7 +94,6 @@ static void flac_set_bps(FLACContext *s)
static av_cold int flac_decode_init(AVCodecContext *avctx)
{
- enum FLACExtradataFormat format;
uint8_t *streaminfo;
int ret;
FLACContext *s = avctx->priv_data;
@@ -105,7 +104,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
if (!avctx->extradata)
return 0;
- if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo))
+ if (!ff_flac_is_extradata_valid(avctx, &streaminfo))
return AVERROR_INVALIDDATA;
/* initialize based on the demuxer-supplied streamdata header */
More information about the ffmpeg-cvslog
mailing list