Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_[de]mux: constify all uses of OptionsContext

Browse Source
pull/388/head
Anton Khirnov 2 years ago
parent 4119480681
commit c15eb2773a
4 changed files with 28 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      fftools/ffmpeg.h
  2. 8
      fftools/ffmpeg_demux.c
  3. 42
      fftools/ffmpeg_mux_init.c
  4. 2
      fftools/ffmpeg_opt.c

4
fftools/ffmpeg.h
Unescape View File

@ -729,7 +729,7 @@ int hwaccel_decode_init(AVCodecContext *avctx);
*/
int of_stream_init(OutputFile *of, OutputStream *ost);
int of_write_trailer(OutputFile *of);
int of_open(OptionsContext *o, const char *filename);
int of_open(const OptionsContext *o, const char *filename);
void of_close(OutputFile **pof);
/*
@ -748,7 +748,7 @@ int64_t of_filesize(OutputFile *of);
AVChapter * const *
of_get_chapters(OutputFile *of, unsigned int *nb_chapters);
int ifile_open(OptionsContext *o, const char *filename);
int ifile_open(const OptionsContext *o, const char *filename);
void ifile_close(InputFile **f);
/**

8
fftools/ffmpeg_demux.c
Unescape View File

@ -468,7 +468,7 @@ void ifile_close(InputFile **pf)
av_freep(pf);
}
static const AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream *st,
static const AVCodec *choose_decoder(const OptionsContext *o, AVFormatContext *s, AVStream *st,
enum HWAccelID hwaccel_id, enum AVHWDeviceType hwaccel_device_type)
{
@ -528,7 +528,7 @@ static int guess_input_channel_layout(InputStream *ist)
return 1;
}
static void add_display_matrix_to_stream(OptionsContext *o,
static void add_display_matrix_to_stream(const OptionsContext *o,
AVFormatContext *ctx, AVStream *st)
{
double rotation = DBL_MAX;
@ -563,7 +563,7 @@ static void add_display_matrix_to_stream(OptionsContext *o,
/* Add all the streams from the given input file to the global
* list of input streams. */
static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
static void add_input_streams(const OptionsContext *o, AVFormatContext *ic)
{
int i, ret;
@ -807,7 +807,7 @@ static void dump_attachment(AVStream *st, const char *filename)
avio_close(out);
}
int ifile_open(OptionsContext *o, const char *filename)
int ifile_open(const OptionsContext *o, const char *filename)
{
Demuxer *d;
InputFile *f;

42
fftools/ffmpeg_mux_init.c
Unescape View File

@ -97,7 +97,7 @@ static int check_opt_bitexact(void *ctx, const AVDictionary *opts,
return 0;
}
static int choose_encoder(OptionsContext *o, AVFormatContext *s,
static int choose_encoder(const OptionsContext *o, AVFormatContext *s,
OutputStream *ost, const AVCodec **enc)
{
enum AVMediaType type = ost->st->codecpar->codec_type;
@ -170,7 +170,7 @@ static int get_preset_file_2(const char *preset_name, const char *codec_name, AV
return ret;
}
static OutputStream *new_output_stream(Muxer *mux, OptionsContext *o,
static OutputStream *new_output_stream(Muxer *mux, const OptionsContext *o,
enum AVMediaType type, int source_index)
{
AVFormatContext *oc = mux->fc;
@ -368,7 +368,7 @@ static OutputStream *new_output_stream(Muxer *mux, OptionsContext *o,
return ost;
}
static char *get_ost_filters(OptionsContext *o, AVFormatContext *oc,
static char *get_ost_filters(const OptionsContext *o, AVFormatContext *oc,
OutputStream *ost)
{
AVStream *st = ost->st;
@ -388,7 +388,7 @@ static char *get_ost_filters(OptionsContext *o, AVFormatContext *oc,
"null" : "anull");
}
static void check_streamcopy_filters(OptionsContext *o, AVFormatContext *oc,
static void check_streamcopy_filters(const OptionsContext *o, AVFormatContext *oc,
const OutputStream *ost, enum AVMediaType type)
{
if (ost->filters_script || ost->filters) {
@ -419,7 +419,7 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
}
}
static OutputStream *new_video_stream(Muxer *mux, OptionsContext *o, int source_index)
static OutputStream *new_video_stream(Muxer *mux, const OptionsContext *o, int source_index)
{
AVFormatContext *oc = mux->fc;
AVStream *st;
@ -658,7 +658,7 @@ static OutputStream *new_video_stream(Muxer *mux, OptionsContext *o, int source_
return ost;
}
static OutputStream *new_audio_stream(Muxer *mux, OptionsContext *o, int source_index)
static OutputStream *new_audio_stream(Muxer *mux, const OptionsContext *o, int source_index)
{
AVFormatContext *oc = mux->fc;
AVStream *st;
@ -756,7 +756,7 @@ static OutputStream *new_audio_stream(Muxer *mux, OptionsContext *o, int source_
return ost;
}
static OutputStream *new_data_stream(Muxer *mux, OptionsContext *o, int source_index)
static OutputStream *new_data_stream(Muxer *mux, const OptionsContext *o, int source_index)
{
OutputStream *ost;
@ -769,7 +769,7 @@ static OutputStream *new_data_stream(Muxer *mux, OptionsContext *o, int source_i
return ost;
}
static OutputStream *new_unknown_stream(Muxer *mux, OptionsContext *o, int source_index)
static OutputStream *new_unknown_stream(Muxer *mux, const OptionsContext *o, int source_index)
{
OutputStream *ost;
@ -782,14 +782,14 @@ static OutputStream *new_unknown_stream(Muxer *mux, OptionsContext *o, int sourc
return ost;
}
static OutputStream *new_attachment_stream(Muxer *mux, OptionsContext *o, int source_index)
static OutputStream *new_attachment_stream(Muxer *mux, const OptionsContext *o, int source_index)
{
OutputStream *ost = new_output_stream(mux, o, AVMEDIA_TYPE_ATTACHMENT, source_index);
ost->finished = 1;
return ost;
}
static OutputStream *new_subtitle_stream(Muxer *mux, OptionsContext *o, int source_index)
static OutputStream *new_subtitle_stream(Muxer *mux, const OptionsContext *o, int source_index)
{
AVStream *st;
OutputStream *ost;
@ -811,7 +811,7 @@ static OutputStream *new_subtitle_stream(Muxer *mux, OptionsContext *o, int sour
return ost;
}
static void init_output_filter(OutputFilter *ofilter, OptionsContext *o,
static void init_output_filter(OutputFilter *ofilter, const OptionsContext *o,
Muxer *mux)
{
OutputStream *ost;
@ -852,7 +852,7 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o,
avfilter_inout_free(&ofilter->out_tmp);
}
static void map_auto_video(Muxer *mux, OptionsContext *o)
static void map_auto_video(Muxer *mux, const OptionsContext *o)
{
AVFormatContext *oc = mux->fc;
InputStream *ist;
@ -898,7 +898,7 @@ static void map_auto_video(Muxer *mux, OptionsContext *o)
new_video_stream(mux, o, idx);
}
static void map_auto_audio(Muxer *mux, OptionsContext *o)
static void map_auto_audio(Muxer *mux, const OptionsContext *o)
{
AVFormatContext *oc = mux->fc;
InputStream *ist;
@ -937,7 +937,7 @@ static void map_auto_audio(Muxer *mux, OptionsContext *o)
new_audio_stream(mux, o, idx);
}
static void map_auto_subtitle(Muxer *mux, OptionsContext *o)
static void map_auto_subtitle(Muxer *mux, const OptionsContext *o)
{
AVFormatContext *oc = mux->fc;
char *subtitle_codec_name = NULL;
@ -975,7 +975,7 @@ static void map_auto_subtitle(Muxer *mux, OptionsContext *o)
}
}
static void map_auto_data(Muxer *mux, OptionsContext *o)
static void map_auto_data(Muxer *mux, const OptionsContext *o)
{
AVFormatContext *oc = mux->fc;
/* Data only if codec id match */
@ -989,7 +989,7 @@ static void map_auto_data(Muxer *mux, OptionsContext *o)
}
}
static void map_manual(Muxer *mux, OptionsContext *o, const StreamMap *map)
static void map_manual(Muxer *mux, const OptionsContext *o, const StreamMap *map)
{
InputStream *ist;
@ -1062,7 +1062,7 @@ loop_end:
}
}
static void create_streams(Muxer *mux, OptionsContext *o)
static void create_streams(Muxer *mux, const OptionsContext *o)
{
int auto_disable_v = o->video_disable;
int auto_disable_a = o->audio_disable;
@ -1194,7 +1194,7 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u
return 0;
}
static void of_add_attachments(Muxer *mux, OptionsContext *o)
static void of_add_attachments(Muxer *mux, const OptionsContext *o)
{
OutputStream *ost;
int err;
@ -1497,7 +1497,7 @@ static int copy_chapters(InputFile *ifile, OutputFile *ofile, AVFormatContext *o
static int copy_metadata(const char *outspec, const char *inspec,
AVFormatContext *oc, AVFormatContext *ic,
int *metadata_global_manual, int *metadata_streams_manual,
int *metadata_chapters_manual, OptionsContext *o)
int *metadata_chapters_manual, const OptionsContext *o)
{
AVDictionary **meta_in = NULL;
AVDictionary **meta_out = NULL;
@ -1577,7 +1577,7 @@ static int copy_metadata(const char *outspec, const char *inspec,
return 0;
}
static void copy_meta(Muxer *mux, OptionsContext *o)
static void copy_meta(Muxer *mux, const OptionsContext *o)
{
OutputFile *of = &mux->of;
AVFormatContext *oc = mux->fc;
@ -1713,7 +1713,7 @@ static int set_dispositions(OutputFile *of, AVFormatContext *ctx)
return 0;
}
int of_open(OptionsContext *o, const char *filename)
int of_open(const OptionsContext *o, const char *filename)
{
Muxer *mux;
AVFormatContext *oc;

2
fftools/ffmpeg_opt.c
Unescape View File

@ -1225,7 +1225,7 @@ static const OptionGroupDef groups[] = {
};
static int open_files(OptionGroupList *l, const char *inout,
int (*open_file)(OptionsContext*, const char*))
int (*open_file)(const OptionsContext*, const char*))
{
int i, ret;

Write Preview
Loading…
Cancel
Save