qtmux: use different stsd atom type for H263 for ISO and QT variants

Fixes #584114.

diff --git a/gst/quicktime/fourcc.h b/gst/quicktime/fourcc.h
index 0fa7aa9b3872beed8f85ba7f5c995b3c0407826f..3db6003603ab8b286146b8b063771fcf8e3e2074 100644 (file)
--- a/gst/quicktime/fourcc.h
+++ b/gst/quicktime/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_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',' ')
 #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/quicktime/gstqtmux.c b/gst/quicktime/gstqtmux.c
index b0df9d71a1ccd0246708da2ee05f66850b8a62f9..03b0a1a643c60bc59f4a9abfde203144cc01bf81 100644 (file)
--- a/gst/quicktime/gstqtmux.c
+++ b/gst/quicktime/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) {
         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) {
     ext_atom = build_h263_extension ();
   } else if (strcmp (mimetype, "video/x-divx") == 0 ||
       strcmp (mimetype, "video/mpeg") == 0) {