diff --git a/AUTHORS b/AUTHORS index 84cf47a5d..c4c9af34f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -89,6 +89,10 @@ Medina, Sergi Maassen, René * Dutch translation +Main, Nicholai + * h.264 width/height calculation fix for pixel formats other than + 4:2:0 + Matsnev, Mike (Haali) * CreateFileUtf8() function * Windows implementation for vsscanf diff --git a/ChangeLog b/ChangeLog index e7d2d9855..5d621b3f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-02-22 Moritz Bunkus + * mkvmerge: bug fix: The width and height of h.264 video tracks + with a pixel format other than 4:2:0 are now calculated + correctly. Fix for bug 649. Patch by Nicholai Main (see AUTHORS). + * mkvmerge: bug fix: Fixed file type recognition and frame drops for VC1 elementary streams that do not start with a sequence header but with frame or field packets instead. diff --git a/tests/results.txt b/tests/results.txt index 584d88dd2..291ab6a01 100644 --- a/tests/results.txt +++ b/tests/results.txt @@ -183,3 +183,4 @@ T_334mp4_audio_encoder_delay:2afe7b533c9f1ed35168e60aaca20dff:passed:20120206-10 T_335ui_locale_cs_CZ:71fab8df9e8e061badc87c06cf36f544-a37e1bdc2b0c026c2970c08841c5e4df:passed:20120206-191406:0.506867942 T_336pgs_misdetected_as_dv:6342b314a120aa4034fc0c9cecb327c7:passed:20120222-121642:0.020091075 T_337vc1_es_sequence_header_not_at_start:354ac585f49800fe79ec0b798f3811ee:passed:20120222-140257:4.328456489 +T_338h264_width_height_pixl_format_non_420:0a9a279941dc8824f6793fdbc9e57f85-ok:passed:20120222-153143:1.279671419 diff --git a/tests/test-338h264_width_height_pixl_format_non_420.rb b/tests/test-338h264_width_height_pixl_format_non_420.rb new file mode 100644 index 000000000..d73fa80f1 --- /dev/null +++ b/tests/test-338h264_width_height_pixl_format_non_420.rb @@ -0,0 +1,10 @@ +#!/usr/bin/ruby -w + +# T_338h264_width_height_pixl_format_non_420 +describe "mkvmerge / h.264 width/height calculations for non-4:2:0 pixel formats" + +test_merge "data/h264/profile_high_444_predictive_@l3.1.h264", :keep_tmp => true +test "verify resolution is 640x360" do + sys "../src/mkvinfo --ui-language en_US -s #{tmp} | head -n 1 | grep -q 'pixel width: 640, pixel height: 360'" + :ok +end