summaryrefslogtreecommitdiff
path: root/libavformat/tests
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2017-03-09 15:43:30 +0100
committerwm4 <nfxjfg@googlemail.com>2017-03-14 23:37:28 +0100
commit55eab1733b9e730ceac33edce9aab56c17ea87b2 (patch)
treef94b5cedda34de6d96e3067230bbcd4f357b4b2a /libavformat/tests
parenta70d5e25936424112ecbeb1c304100e68bce0faa (diff)
downloadffmpeg-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 'libavformat/tests')
-rw-r--r--libavformat/tests/seek.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/tests/seek.c b/libavformat/tests/seek.c
index 7ed56ba4ef..5cf3a123e3 100644
--- a/libavformat/tests/seek.c
+++ b/libavformat/tests/seek.c
@@ -67,6 +67,8 @@ int main(int argc, char **argv)
int frame_count = 1;
int duration = 4;
+ ic->flags |= AVFMT_FLAG_KEEP_SIDE_DATA;
+
for(i=2; i<argc; i+=2){
if (!strcmp(argv[i], "-seekforw")){
seekfirst = atoi(argv[i+1]);