From 125c35cb08ece825dade33b9dc7bf7babe1fc46d Mon Sep 17 00:00:00 2001
From: Gyan Doshi
Date: Sat, 14 Jul 2018 13:59:51 +0530
Subject: [PATCH] avformat/mov: only set handler_name from mdia->hdlr
6 FATE references updated.
Fixes #7104
---
libavformat/mov.c | 3 ++-
tests/ref/fate/copy-trac236 | 4 ++--
tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov | 2 +-
tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov | 2 +-
tests/ref/fate/mov-zombie | 2 +-
tests/ref/fate/rgb24-mkv | 4 ++--
tests/ref/lavf-fate/mov_qtrle_mace6 | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index bdd6f64108..eda3fff6d5 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -765,7 +765,8 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
title_str[title_size] = 0;
if (title_str[0]) {
int off = (!c->isom && title_str[0] == title_size - 1);
-av_dict_set(>metadata, "handler_name", title_str + off, 0);
+// flag added so as to not set stream handler name if already set
from mdia->hdlr
+av_dict_set(>metadata, "handler_name", title_str + off,
AV_DICT_DONT_OVERWRITE);
}
av_freep(_str);
}
diff --git a/tests/ref/fate/copy-trac236 b/tests/ref/fate/copy-trac236
index 6470c05a05..2ac05e63e6 100644
--- a/tests/ref/fate/copy-trac236
+++ b/tests/ref/fate/copy-trac236
@@ -1,5 +1,5 @@
-8b57d14c14bb4cdaca660d161e08eb8f *tests/data/fate/copy-trac236.mov
-630861 tests/data/fate/copy-trac236.mov
+959a4d78c6c11936e361fc3101a013eb *tests/data/fate/copy-trac236.mov
+630860 tests/data/fate/copy-trac236.mov
#tb 0: 100/2997
#media_type 0: video
#codec_id 0: rawvideo
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
index f5ecdd4311..cde9f2ff9e 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
@@ -68,6 +68,6 @@ DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0
DISPOSITION:timed_thumbnails=0
TAG:language=eng
-TAG:handler_name=DataHandler
+TAG:handler_name=Module de gestion video
TAG:encoder=HAPAlpha Only
[/STREAM]
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
index c3a0a599fd..dd85e68d9e 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
@@ -68,6 +68,6 @@ DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0
DISPOSITION:timed_thumbnails=0
TAG:language=eng
-TAG:handler_name=DataHandler
+TAG:handler_name=Module de gestion video
TAG:encoder=HAPQ
[/STREAM]
diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie
index fef2adc354..f45fa59637 100644
--- a/tests/ref/fate/mov-zombie
+++ b/tests/ref/fate/mov-zombie
@@ -129,5 +129,5 @@
packet|codec_type=video|stream_index=0|pts=188623|pts_time=2.095811|dts=188622|d
frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=188623|pkt_pts_time=2.095811|pkt_dts=188622|pkt_dts_time=2.095800|best_effort_timestamp=188623|best_effort_timestamp_time=2.095811|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=100846|pkt_size=974|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=64|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=580|pos=101820|flags=__
frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=191626|pkt_pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft