From 6bb25dba0bc3dd622f3c9cf8564e305e0dd3176d Mon Sep 17 00:00:00 2001 From: Stéphane Loeuillet Date: Mon, 13 Dec 2004 12:18:07 +0000 Subject: forgot to add h264 to avidemux caps Original commit message from CVS: forgot to add h264 to avidemux caps --- ChangeLog | 1 + gst/avi/gstavimux.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index d6e9ff10..a72e1e56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * gst/wavenc/riff.h: * gst-libs/gst/riff/riff-media.c: * gst-libs/gst/riff/riff-ids.h: + * gst/avi/gstavimux.c add 4CC code for VideoSoft h264 in AVI (VSSH) fixes bug #160655 remove s323 from riff, it's quicktime specific :( diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index b1dee2a4..c558c6ad 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -104,6 +104,10 @@ static GstStaticPadTemplate video_sink_factory = "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], " "framerate = (double) [ 0, MAX ]; " + "video/x-h264, " + "width = (int) [ 16, 4096 ], " + "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ]; " "video/x-dv, " "width = (int) 720, " "height = (int) { 576, 480 }, " -- cgit