virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/matroskaenc: don't write a FlagInterlaced element if it would write the default value

Browse Source 
The spec says:
"Mandatory elements with a default value may be left out of the file. In the absence
of a mandatory element, the element's default value is used."

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2016-10-11 14:36:16 -03:00
parent 51f3278089
commit 8063978bfc
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/matroskaenc.c
View File

@@ -876,8 +876,6 @@ static void mkv_write_field_order(AVIOContext *pb, int mode,
{ {
switch (field_order) { switch (field_order) {
case AV_FIELD_UNKNOWN: case AV_FIELD_UNKNOWN:
put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED,
MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED);
break; break;
case AV_FIELD_PROGRESSIVE: case AV_FIELD_PROGRESSIVE:
put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED, put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED,

2
tests/fate/matroska.mak
View File

@@ -4,6 +4,6 @@
FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux
fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska
fate-matroska-remux: CMP = oneline fate-matroska-remux: CMP = oneline
fate-matroska-remux: REF = d1a5fc15908ba10ca3efa282059ca79f fate-matroska-remux: REF = 84e950f59677e306f944fca484888c5d
FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes) FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)