mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

add VSSH (VideoSoft h264) and remove s323 (h323) from riff-lib because s323 is quicktime specific

Browse source 
Original commit message from CVS:
add VSSH (VideoSoft h264) and remove s323 (h323) from riff-lib
because s323 is quicktime specific
This commit is contained in:
Stéphane Loeuillet 2004-12-13 12:11:57 +00:00
parent 82ccc32e94
commit 403876e637
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-12-13 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
* gst/wavenc/riff.h:
* gst-libs/gst/riff/riff-media.c:
* gst-libs/gst/riff/riff-ids.h:
add 4CC code for VideoSoft h264 in AVI (VSSH)
fixes bug #160655
remove s323 from riff, it's quicktime specific :(
2004-12-13 Stephane Loeuillet <stephane.loeuillet@tiscali.fr> 2004-12-13 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
* gst/asfdemux/README * gst/asfdemux/README

2
gst-libs/gst/riff/riff-ids.h
View file

@ -185,11 +185,11 @@
#define GST_RIFF_WPY2 GST_MAKE_FOURCC ('W', 'P', 'Y', '2') #define GST_RIFF_WPY2 GST_MAKE_FOURCC ('W', 'P', 'Y', '2')
#define GST_RIFF_m263 GST_MAKE_FOURCC ('m', '2', '6', '3') #define GST_RIFF_m263 GST_MAKE_FOURCC ('m', '2', '6', '3')
#define GST_RIFF_M263 GST_MAKE_FOURCC ('M', '2', '6', '3') #define GST_RIFF_M263 GST_MAKE_FOURCC ('M', '2', '6', '3')
#define GST_RIFF_s263 GST_MAKE_FOURCC ('s', '2', '6', '3')
#define GST_RIFF_H263 GST_MAKE_FOURCC ('H', '2', '6', '3') #define GST_RIFF_H263 GST_MAKE_FOURCC ('H', '2', '6', '3')
#define GST_RIFF_i263 GST_MAKE_FOURCC ('i', '2', '6', '3') #define GST_RIFF_i263 GST_MAKE_FOURCC ('i', '2', '6', '3')
#define GST_RIFF_L263 GST_MAKE_FOURCC ('L', '2', '6', '3') #define GST_RIFF_L263 GST_MAKE_FOURCC ('L', '2', '6', '3')
#define GST_RIFF_x263 GST_MAKE_FOURCC ('x', '2', '6', '3') #define GST_RIFF_x263 GST_MAKE_FOURCC ('x', '2', '6', '3')
#define GST_RIFF_VSSH GST_MAKE_FOURCC ( 'V', 'S', 'S', 'H') /* H2.64 */
#define GST_RIFF_Q1_0 GST_MAKE_FOURCC ('Q', '1',0x2e, '0') #define GST_RIFF_Q1_0 GST_MAKE_FOURCC ('Q', '1',0x2e, '0')
#define GST_RIFF_SFMC GST_MAKE_FOURCC ('S', 'F', 'M', 'C') #define GST_RIFF_SFMC GST_MAKE_FOURCC ('S', 'F', 'M', 'C')

12
gst-libs/gst/riff/riff-media.c
View file

@ -142,12 +142,6 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
*codec_name = g_strdup ("Microsoft H.263"); *codec_name = g_strdup ("Microsoft H.263");
break; break;
case GST_MAKE_FOURCC ('s', '2', '6', '3'):
caps = gst_caps_new_simple ("video/x-h263", NULL);
if (codec_name)
*codec_name = g_strdup ("3GPP H.263");
break;
case GST_MAKE_FOURCC ('V', 'D', 'O', 'W'): case GST_MAKE_FOURCC ('V', 'D', 'O', 'W'):
caps = gst_caps_new_simple ("video/x-h263", NULL); caps = gst_caps_new_simple ("video/x-h263", NULL);
if (codec_name) if (codec_name)
@ -166,6 +160,12 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
*codec_name = g_strdup ("Xirlink H.263"); *codec_name = g_strdup ("Xirlink H.263");
break; break;
case GST_MAKE_FOURCC ('V', 'S', 'S', 'H'):
caps = gst_caps_new_simple ("video/x-h264", NULL);
if (codec_name)
*codec_name = g_strdup ("VideoSoft H.264");
break;
case GST_MAKE_FOURCC ('D', 'I', 'V', '3'): case GST_MAKE_FOURCC ('D', 'I', 'V', '3'):
case GST_MAKE_FOURCC ('d', 'i', 'v', '3'): case GST_MAKE_FOURCC ('d', 'i', 'v', '3'):
case GST_MAKE_FOURCC ('D', 'I', 'V', '4'): case GST_MAKE_FOURCC ('D', 'I', 'V', '4'):