diff options
| author | wm4 <nfxjfg@googlemail.com> | 2017-03-09 15:43:30 +0100 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2017-03-14 23:37:28 +0100 |
| commit | 55eab1733b9e730ceac33edce9aab56c17ea87b2 (patch) | |
| tree | f94b5cedda34de6d96e3067230bbcd4f357b4b2a /ffmpeg_opt.c | |
| parent | a70d5e25936424112ecbeb1c304100e68bce0faa (diff) | |
| download | ffmpeg-55eab1733b9e730ceac33edce9aab56c17ea87b2.tar.gz | |
ffmpeg, ffprobe: don't "merge" side data into packet data by default
Preparation for potentially disabling merged side data by default in the
libs. Do this in particular because it affects fate tests.
The changed tests either reflect added packet side data, or the changed
packet size due to merged side data removal reducing the packet size.
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index e2c0176e14..fc885dfac3 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -927,6 +927,7 @@ 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); } @@ -1912,6 +1913,7 @@ 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) |