It makes no sense here, as flac_parse_block_header()
is not even supposed to advance the caller's pointer.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/flac.h | 6 +++---
libavformat/flacdec.c | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/flac.h b/libavcodec/flac.h
index fd899ef72c..f118dbbff3 100644
--- a/libavcodec/flac.h
+++ b/libavcodec/flac.h
@@ -27,7 +27,7 @@
#ifndef AVCODEC_FLAC_H
#define AVCODEC_FLAC_H
-#include "bytestream.h"
+#include "libavutil/intreadwrite.h"
#define FLAC_STREAMINFO_SIZE 34
#define FLAC_MAX_CHANNELS 8
@@ -63,13 +63,13 @@ enum {
static av_always_inline void flac_parse_block_header(const uint8_t
*block_header,
int *last, int *type,
int *size)
{
- int tmp = bytestream_get_byte(&block_header);
+ int tmp = *block_header;
if (last)
*last = tmp & 0x80;
if (type)
*type = tmp & 0x7F;
if (size)
- *size = bytestream_get_be24(&block_header);
+ *size = AV_RB24(block_header + 1);
}
#endif /* AVCODEC_FLAC_H */
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 09404b67bb..eadd41fc36 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -20,6 +20,7 @@
*/
#include "libavutil/channel_layout.h"
+#include "libavcodec/bytestream.h"
#include "libavcodec/flac.h"
#include "avformat.h"
#include "demux.h"
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
