[FFmpeg-devel] [PATCH 2/2] lavc: add const to AVCodecContext.codec_descriptor.

Stefano Sabatini stefasab at gmail.com
Mon Aug 13 13:49:14 CEST 2012


On date Monday 2012-08-13 11:50:35 +0200, Nicolas George encoded:
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  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)

Should be OK.
-- 
FFmpeg = Fundamentalist & Fanciful Minimal Pitiless Enhanced Gospel


More information about the ffmpeg-devel mailing list