diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-02-15 00:11:17 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-02-15 00:14:03 +0000 |
commit | 466894d2f4283496dee202750cccf7ac01fb8546 (patch) | |
tree | edb9c158e183c9e4dee2cd6bf4bca426372b4ff6 | |
parent | 5f777a96bebc947c0c59c5b2866fd531cdef8dbf (diff) |
ogg: theora PAR of 0:N, N:0 or 0:0 is allowed and maps to 1:1
See #609252.
-rw-r--r-- | ext/ogg/gstoggstream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index 9b4d1b09..3dac5ad0 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -312,14 +312,14 @@ setup_theora_mapper (GstOggStream * pad, ogg_packet * packet) G_TYPE_INT, h, NULL); } + /* PAR of 0:N, N:0 and 0:0 is allowed and maps to 1:1 */ + if (par_n == 0 || par_d == 0) + par_n = par_d = 1; + /* only add framerate now so caps look prettier, with width/height first */ gst_caps_set_simple (pad->caps, "framerate", GST_TYPE_FRACTION, - pad->granulerate_n, pad->granulerate_d, NULL); - - if (par_n > 0 && par_d > 0) { - gst_caps_set_simple (pad->caps, "pixel-aspect-ratio", GST_TYPE_FRACTION, - par_n, par_d, NULL); - } + pad->granulerate_n, pad->granulerate_d, "pixel-aspect-ratio", + GST_TYPE_FRACTION, par_n, par_d, NULL); return TRUE; } |