diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-09-29 10:19:56 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-09-29 10:19:56 +0300 |
| commit | 7ab3df45429208c9457138ba91b438c347419764 (patch) | |
| tree | 6b511a4b53250c7b106ec586aa43d76cfe1206f3 /gst/matroska/matroska-mux.c | |
| parent | 7025d014bbec126d2e583f6a71ec3149797eb345 (diff) | |
matroskamux: Always write the default frame duration for VP8/9 too
The WebM spec allows this now, and it allows us to guess a framerate.
See https://bugzilla.gnome.org/show_bug.cgi?id=772141 and
also https://bugzilla.gnome.org/show_bug.cgi?id=654379
Diffstat (limited to 'gst/matroska/matroska-mux.c')
| -rw-r--r-- | gst/matroska/matroska-mux.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 4922496f8..f77bd49c7 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -357,7 +357,6 @@ gst_matroska_mux_class_init (GstMatroskaMuxClass * klass) * Start of pad option handler code */ #define DEFAULT_PAD_FRAME_DURATION TRUE -#define DEFAULT_PAD_FRAME_DURATION_VP8 FALSE enum { @@ -978,13 +977,6 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps) videocontext->pixel_width = width; videocontext->pixel_height = height; - /* set vp8 defaults or let user override it */ - if (GST_MATROSKAMUX_PAD_CAST (pad)->frame_duration_user == FALSE - && (!strcmp (mimetype, "video/x-vp8") - || !strcmp (mimetype, "video/x-vp9"))) - GST_MATROSKAMUX_PAD_CAST (pad)->frame_duration = - DEFAULT_PAD_FRAME_DURATION_VP8; - if (GST_MATROSKAMUX_PAD_CAST (pad)->frame_duration && gst_structure_get_fraction (structure, "framerate", &fps_n, &fps_d) && fps_n > 0) { |