[SCM] libav/experimental: Write the display size elements

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7332adddaedb155f5f5fcffa0f9dc2452a29d65b
Author: David Conrad <lessen42 at gmail.com>
Date:   Wed Sep 5 00:24:15 2007 +0000

    Write the display size elements
    
    Originally committed as revision 10342 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 3daaa96..a0577cb 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -476,7 +476,10 @@ static int mkv_write_tracks(AVFormatContext *s)
                 // XXX: interlace flag?
                 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width);
                 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height);
-                // XXX: display width/height
+                if (codec->sample_aspect_ratio.num) {
+                    put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , codec->sample_aspect_ratio.num);
+                    put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->sample_aspect_ratio.den);
+                }
                 end_ebml_master(pb, subinfo);
                 break;
 

-- 
Libav/FFmpeg packaging