diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-28 23:47:22 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-29 00:09:52 -0300 |
| commit | ca2b7794234cccd6c4ae548c4bd2eac5c53b80f2 (patch) | |
| tree | 36569ce7e11047c0a504c0eeaf25e76aa9e23c9b /fftools | |
| parent | 8b43039fe19cacb8e7e0950ae50851cb91fa34e4 (diff) | |
| download | ffmpeg-ca2b7794234cccd6c4ae548c4bd2eac5c53b80f2.tar.gz | |
avformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flag
It has no effect whatsoever since the major bump.
Replace the flag's documentation to reflect this as well.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg_opt.c | 2 | ||||
| -rw-r--r-- | fftools/ffprobe.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 3a947d8686..f4ff1605f0 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -991,7 +991,6 @@ static int open_input_file(OptionsContext *o, const char *filename) print_error(filename, AVERROR(ENOMEM)); exit_program(1); } - ic->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; if (o->nb_audio_sample_rate) { av_dict_set_int(&o->g->format_opts, "sample_rate", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i, 0); } @@ -1989,7 +1988,6 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch int i, err; AVFormatContext *ic = avformat_alloc_context(); - ic->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; ic->interrupt_callback = int_cb; err = avformat_open_input(&ic, filename, NULL, NULL); if (err < 0) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index b2e8949d9f..ab36f8bc42 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2828,8 +2828,6 @@ static int open_input_file(InputFile *ifile, const char *filename) exit_program(1); } - fmt_ctx->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; - if (!av_dict_get(format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE)) { av_dict_set(&format_opts, "scan_all_pmts", "1", AV_DICT_DONT_OVERWRITE); scan_all_pmts_set = 1; |