diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-05-31 19:26:30 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-05-31 19:26:30 -0400 |
| commit | af14cf34e69e46bfd6544a420b3fdd7e131aa69a (patch) | |
| tree | 2bd39ab6ab67995d6e4c69a3e6c6eae2a17f350e /gst/qtmux | |
| parent | bd9a3cbd254714bf71cd87c31d4e5b77f6a96cba (diff) | |
| parent | b19dd5920605c0036dacf19591a6feca7a736a50 (diff) | |
| download | gst-plugins-bad-af14cf34e69e46bfd6544a420b3fdd7e131aa69a.tar.gz gst-plugins-bad-af14cf34e69e46bfd6544a420b3fdd7e131aa69a.tar.bz2 gst-plugins-bad-af14cf34e69e46bfd6544a420b3fdd7e131aa69a.zip | |
Merge branch 'fdo' into lv2
Diffstat (limited to 'gst/qtmux')
| -rw-r--r-- | gst/qtmux/fourcc.h | 1 | ||||
| -rw-r--r-- | gst/qtmux/gstqtmux.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gst/qtmux/fourcc.h b/gst/qtmux/fourcc.h index 0fa7aa9b..3db60036 100644 --- a/gst/qtmux/fourcc.h +++ b/gst/qtmux/fourcc.h @@ -140,6 +140,7 @@ G_BEGIN_DECLS #define FOURCC_drms GST_MAKE_FOURCC('d','r','m','s') #define FOURCC_avc1 GST_MAKE_FOURCC('a','v','c','1') #define FOURCC_h263 GST_MAKE_FOURCC('h','2','6','3') +#define FOURCC_s263 GST_MAKE_FOURCC('s','2','6','3') #define FOURCC_avcC GST_MAKE_FOURCC('a','v','c','C') #define FOURCC_VP31 GST_MAKE_FOURCC('V','P','3','1') #define FOURCC_rle_ GST_MAKE_FOURCC('r','l','e',' ') diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c index b0df9d71..03b0a1a6 100644 --- a/gst/qtmux/gstqtmux.c +++ b/gst/qtmux/gstqtmux.c @@ -1507,7 +1507,10 @@ gst_qt_mux_video_sink_set_caps (GstPad * pad, GstCaps * caps) break; } } else if (strcmp (mimetype, "video/x-h263") == 0) { - entry.fourcc = FOURCC_h263; + if (format == GST_QT_MUX_FORMAT_QT) + entry.fourcc = FOURCC_h263; + else + entry.fourcc = FOURCC_s263; ext_atom = build_h263_extension (); } else if (strcmp (mimetype, "video/x-divx") == 0 || strcmp (mimetype, "video/mpeg") == 0) { |