From 55eab1733b9e730ceac33edce9aab56c17ea87b2 Mon Sep 17 00:00:00 2001
From: wm4 <nfxjfg@googlemail.com>
Date: Thu, 9 Mar 2017 15:43:30 +0100
Subject: 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.
---
 ffmpeg_opt.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ffmpeg_opt.c')

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)
-- 
cgit v1.2.3