diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-25 05:32:20 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:13 -0300 |
| commit | 14fa0a4efbc989619860ed8ec0fd33dcdae558b0 (patch) | |
| tree | 291cd2ef68578516753fdc4d4488b2eb8bac453d | |
| parent | 420cedd49745b284c35d97b936b71ff79b43bdf7 (diff) | |
| download | ffmpeg-14fa0a4efbc989619860ed8ec0fd33dcdae558b0.tar.gz | |
avformat/avformat: Constify AVFormatContext.*_codec pointers
This also allows to exclusively use pointers to const AVCodec in
fftools/ffmpeg_opt.c.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 4 | ||||
| -rw-r--r-- | libavformat/avformat.h | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 0434a410f1..63434ef635 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: 2021-04-27 - xxxxxxxxxx - lavf yyyyyyyyy - avformat.h + Constified AVFormatContext.*_codec. + +2021-04-27 - xxxxxxxxxx - lavf yyyyyyyyy - avformat.h Constified the pointers to AVInputFormats and AVOutputFormats in AVFormatContext, avformat_alloc_output_context2(), av_find_input_format(), av_probe_input_format(), diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 9e26de5a94..e66141f3ab 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -737,11 +737,11 @@ static int opt_recording_timestamp(void *optctx, const char *opt, const char *ar return 0; } -static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder) +static const AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder) { const AVCodecDescriptor *desc; const char *codec_string = encoder ? "encoder" : "decoder"; - AVCodec *codec; + const AVCodec *codec; codec = encoder ? avcodec_find_encoder_by_name(name) : diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 3834c9869f..23bdaa207b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1598,7 +1598,7 @@ typedef struct AVFormatContext { * the same codec_id. * Demuxing: Set by user */ - AVCodec *video_codec; + const AVCodec *video_codec; /** * Forced audio codec. @@ -1606,7 +1606,7 @@ typedef struct AVFormatContext { * the same codec_id. * Demuxing: Set by user */ - AVCodec *audio_codec; + const AVCodec *audio_codec; /** * Forced subtitle codec. @@ -1614,7 +1614,7 @@ typedef struct AVFormatContext { * the same codec_id. * Demuxing: Set by user */ - AVCodec *subtitle_codec; + const AVCodec *subtitle_codec; /** * Forced data codec. @@ -1622,7 +1622,7 @@ typedef struct AVFormatContext { * the same codec_id. * Demuxing: Set by user */ - AVCodec *data_codec; + const AVCodec *data_codec; /** * Number of bytes to be written as padding in a metadata header. |