From 5dd7ea9f569b92c1e3de10eff46b80f3dfa63a1d Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sun, 26 Feb 2017 12:34:41 +0100
Subject: [PATCH] lavc/internal: Constify AVPacket* in AVCodecInternal.
Fixes a gcc warning:
libavcodec/utils.c:2244:26: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
---
libavcodec/internal.h | 2 +-
libavcodec/utils.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index d6e620a9832..6e93eeb1a91 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -141,7 +141,7 @@ typedef struct AVCodecInternal {
* Current packet as passed into the decoder, to avoid having to pass the
* packet into every function.
*/
- AVPacket *pkt;
+ const AVPacket *pkt;
/**
* temporary buffer used for encoders to store their bitstream
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 4d1b63222f3..d41ea572f5e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -745,7 +745,7 @@ int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags
}
}
-static int add_metadata_from_side_data(AVPacket *avpkt, AVFrame *frame)
+static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame)
{
int size;
const uint8_t *side_metadata;
@@ -759,7 +759,7 @@ static int add_metadata_from_side_data(AVPacket *avpkt, AVFrame *frame)
int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
{
- AVPacket *pkt = avctx->internal->pkt;
+ const AVPacket *pkt = avctx->internal->pkt;
int i;
static const struct {
enum AVPacketSideDataType packet;
--
GitLab