avcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers()
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Dec 2014 13:46:19 +0000 (14:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 13:30:45 +0000 (14:30 +0100)
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vorbis_parser.c
libavcodec/vorbisdec.c
libavcodec/vp3.c
libavcodec/xiph.c
libavcodec/xiph.h
libavformat/matroskaenc.c
libavformat/oggenc.c
libavformat/sdp.c

index b99f115..547fd47 100644 (file)
@@ -184,7 +184,7 @@ bad_header:
 static int vorbis_parse_init(AVVorbisParseContext *s,
                              const uint8_t *extradata, int extradata_size)
 {
-    uint8_t *header_start[3];
+    const uint8_t *header_start[3];
     int header_len[3];
     int ret;
 
index fb16099..09a863f 100644 (file)
@@ -1017,7 +1017,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx)
     vorbis_context *vc = avctx->priv_data;
     uint8_t *headers   = avctx->extradata;
     int headers_len    = avctx->extradata_size;
-    uint8_t *header_start[3];
+    const uint8_t *header_start[3];
     int header_len[3];
     GetBitContext *gb = &vc->gb;
     int hdr_type, ret;
index 8aca83a..0e37f0d 100644 (file)
@@ -2437,7 +2437,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
     Vp3DecodeContext *s = avctx->priv_data;
     GetBitContext gb;
     int ptype;
-    uint8_t *header_start[3];
+    const uint8_t *header_start[3];
     int header_len[3];
     int i;
 
index 49b978d..d072224 100644 (file)
@@ -22,7 +22,7 @@
 #include "xiph.h"
 
 int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size,
-                          int first_header_size, uint8_t *header_start[3],
+                          int first_header_size, const uint8_t *header_start[3],
                           int header_len[3])
 {
     int i;
index b8ddbbe..1741a51 100644 (file)
@@ -37,7 +37,7 @@
  * @return On error a negative value is returned, on success zero.
  */
 int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size,
-                              int first_header_size, uint8_t *header_start[3],
+                              int first_header_size, const uint8_t *header_start[3],
                               int header_len[3]);
 
 #endif /* AVCODEC_XIPH_H */
index e8e8da0..c781c8a 100644 (file)
@@ -491,7 +491,7 @@ static int64_t mkv_write_cues(AVFormatContext *s, mkv_cues *cues, mkv_track *tra
 
 static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContext *codec)
 {
-    uint8_t *header_start[3];
+    const uint8_t *header_start[3];
     int header_len[3];
     int first_header_size;
     int j;
index f3413c5..3929311 100644 (file)
@@ -508,7 +508,7 @@ static int ogg_write_header(AVFormatContext *s)
 
             if (avpriv_split_xiph_headers(st->codec->extradata, st->codec->extradata_size,
                                       st->codec->codec_id == AV_CODEC_ID_VORBIS ? 30 : 42,
-                                      oggstream->header, oggstream->header_len) < 0) {
+                                      (const uint8_t**)oggstream->header, oggstream->header_len) < 0) {
                 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
                 av_freep(&st->priv_data);
                 return AVERROR_INVALIDDATA;
index 5bf9de6..fadabbe 100644 (file)
@@ -348,7 +348,7 @@ static char *extradata2config(AVCodecContext *c)
 static char *xiph_extradata2config(AVCodecContext *c)
 {
     char *config, *encoded_config;
-    uint8_t *header_start[3];
+    const uint8_t *header_start[3];
     int headers_len, header_len[3], config_len;
     int first_header_size;