[FFmpeg-cvslog] lavc: add const to AVCodecContext.codec_descriptor.
Nicolas George
git at videolan.org
Tue Aug 14 11:57:13 CEST 2012
ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Mon Aug 13 11:28:10 2012 +0200| [2d3acbfe8c4f54f44edb66298954a0233d819a16] | committer: Nicolas George
lavc: add const to AVCodecContext.codec_descriptor.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d3acbfe8c4f54f44edb66298954a0233d819a16
---
libavcodec/avcodec.h | 6 +++---
libavcodec/utils.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f739acd..07a9e10 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3042,7 +3042,7 @@ typedef struct AVCodecContext {
* - encoding: unused.
* - decoding: set by libavcodec.
*/
- AVCodecDescriptor *codec_descriptor;
+ const AVCodecDescriptor *codec_descriptor;
/**
* Current statistics for PTS correction.
@@ -3058,8 +3058,8 @@ typedef struct AVCodecContext {
AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx);
void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val);
-AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
-void av_codec_set_codec_descriptor(AVCodecContext *avctx, AVCodecDescriptor *desc);
+const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
+void av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc);
/**
* AVProfile.
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 03caf1c..7608551 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -712,7 +712,7 @@ MAKE_ACCESSORS(AVFrame, frame, AVDictionary *, metadata)
MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags)
MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase)
-MAKE_ACCESSORS(AVCodecContext, codec, AVCodecDescriptor*, codec_descriptor)
+MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor)
static void avcodec_get_subtitle_defaults(AVSubtitle *sub)
{
More information about the ffmpeg-cvslog
mailing list