RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 14:00:43 +00:00
Code Issues Projects Releases Wiki Activity

fate/matroska: Stop using unicode in command line paramters

Browse Source 
The fate-run.sh shell script exports LC_ALL=C before invoking the
test executables; this is probably done for consistency.

When executing Windows binaries with Wine, it normally handles
UTF-8 command line parameters just fine - but with LC_ALL set to
C, it treats them as plain ASCII.

As the unicode command line parameters wasn't the main thing
being tested here, just convert them to plain ASCII, for
portability. This fixes the test for all test configurations that
use Wine.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2023-08-21 23:08:25 +03:00
parent aea2d269db
commit 95433eb3aa
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/fate/matroska.mak
View File

@ -228,10 +228,10 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, OGG_DEMUXER THEORA_DECODER)
fate-matroska-stereo_mode: CMD = transcode ogg $(TARGET_SAMPLES)/vp3/offset_test.ogv matroska \ fate-matroska-stereo_mode: CMD = transcode ogg $(TARGET_SAMPLES)/vp3/offset_test.ogv matroska \
"-c copy -write_crc32 0 -default_mode infer \ "-c copy -write_crc32 0 -default_mode infer \
-map 0 -disposition:s:0 +original+dub -metadata:s:0 language=ger \ -map 0 -disposition:s:0 +original+dub -metadata:s:0 language=ger \
-map 0 -metadata:s:1 stereo_mode=left_right -metadata:s:1 language=ger-at -metadata:s:1 description-ger=Deutsch -metadata:s:1 description-fre=Français \ -map 0 -metadata:s:1 stereo_mode=left_right -metadata:s:1 language=ger-at -metadata:s:1 description-ger=Deutsch -metadata:s:1 description-fre=Francais \
-map 0 -metadata:s:2 stereo_mode=bottom_top -metadata:s:2 language=eng -metadata:s:2 description-de=Deutsch -metadata:s:2 description-fra=Français \ -map 0 -metadata:s:2 stereo_mode=bottom_top -metadata:s:2 language=eng -metadata:s:2 description-de=Deutsch -metadata:s:2 description-fra=Francais \
-map 0 -metadata:s:3 stereo_mode=row_interleaved_rl -sar:3 3:1 -disposition:3 +default -metadata:s:3 language=deu-at \ -map 0 -metadata:s:3 stereo_mode=row_interleaved_rl -sar:3 3:1 -disposition:3 +default -metadata:s:3 language=deu-at \
-map 0 -metadata:s:4 stereo_mode=col_interleaved_rl -sar:4 16:9 -metadata:s:4 language=fre -metadata:s:4 description-deu-at=Österreichisch \ -map 0 -metadata:s:4 stereo_mode=col_interleaved_rl -sar:4 16:9 -metadata:s:4 language=fre -metadata:s:4 description-deu-at=Oesterreichisch \
-map 0 -metadata:s:5 stereo_mode=anaglyph_cyan_red -sar:5 16:9 -disposition:5 +default -metadata:s:5 language=fra \ -map 0 -metadata:s:5 stereo_mode=anaglyph_cyan_red -sar:5 16:9 -disposition:5 +default -metadata:s:5 language=fra \
-map 0 -metadata:s:6 stereo_mode=12 -sar:6 2:1 -metadata:s:6 language=de -metadata:s:6 description-deu=Deutsch" \ -map 0 -metadata:s:6 stereo_mode=12 -sar:6 2:1 -metadata:s:6 language=de -metadata:s:6 description-deu=Deutsch" \
"-map 0 -c copy" \ "-map 0 -c copy" \

10
tests/ref/fate/matroska-stereo_mode
View File

@ -1,5 +1,5 @@
1f074fcfb6f64ade0ad4b01f9e910515 *tests/data/fate/matroska-stereo_mode.matroska 41cc6b0d334ac0465988579b99b78002 *tests/data/fate/matroska-stereo_mode.matroska
1470758 tests/data/fate/matroska-stereo_mode.matroska 1470756 tests/data/fate/matroska-stereo_mode.matroska
#extradata 0: 3510, 0x560c3919 #extradata 0: 3510, 0x560c3919
#extradata 1: 3510, 0x560c3919 #extradata 1: 3510, 0x560c3919
#extradata 2: 3510, 0x560c3919 #extradata 2: 3510, 0x560c3919
@ -126,7 +126,7 @@ DISPOSITION:original=0
TAG:language=ger-at TAG:language=ger-at
TAG:stereo_mode=left_right TAG:stereo_mode=left_right
TAG:DESCRIPTION-ger=Deutsch TAG:DESCRIPTION-ger=Deutsch
TAG:DESCRIPTION-fre=Français TAG:DESCRIPTION-fre=Francais
TAG:DURATION=00:00:10.000000000 TAG:DURATION=00:00:10.000000000
[SIDE_DATA] [SIDE_DATA]
side_data_type=Stereo 3D side_data_type=Stereo 3D
@ -141,7 +141,7 @@ DISPOSITION:original=0
TAG:language=eng TAG:language=eng
TAG:stereo_mode=bottom_top TAG:stereo_mode=bottom_top
TAG:DESCRIPTION-ger=Deutsch TAG:DESCRIPTION-ger=Deutsch
TAG:DESCRIPTION-fre=Français TAG:DESCRIPTION-fre=Francais
TAG:DURATION=00:00:10.000000000 TAG:DURATION=00:00:10.000000000
[SIDE_DATA] [SIDE_DATA]
side_data_type=Stereo 3D side_data_type=Stereo 3D
@ -168,7 +168,7 @@ DISPOSITION:dub=0
DISPOSITION:original=0 DISPOSITION:original=0
TAG:language=fre TAG:language=fre
TAG:stereo_mode=col_interleaved_rl TAG:stereo_mode=col_interleaved_rl
TAG:DESCRIPTION-DEU-AT=Österreichisch TAG:DESCRIPTION-DEU-AT=Oesterreichisch
TAG:DURATION=00:00:10.000000000 TAG:DURATION=00:00:10.000000000
[SIDE_DATA] [SIDE_DATA]
side_data_type=Stereo 3D side_data_type=Stereo 3D