mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-28 18:18:38 +00:00
forgot to add h264 to avidemux caps
Original commit message from CVS: forgot to add h264 to avidemux caps
This commit is contained in:
parent
2a5d5ee911
commit
6bb25dba0b
2 changed files with 5 additions and 0 deletions
|
@ -3,6 +3,7 @@
|
||||||
* gst/wavenc/riff.h:
|
* gst/wavenc/riff.h:
|
||||||
* gst-libs/gst/riff/riff-media.c:
|
* gst-libs/gst/riff/riff-media.c:
|
||||||
* gst-libs/gst/riff/riff-ids.h:
|
* gst-libs/gst/riff/riff-ids.h:
|
||||||
|
* gst/avi/gstavimux.c
|
||||||
add 4CC code for VideoSoft h264 in AVI (VSSH)
|
add 4CC code for VideoSoft h264 in AVI (VSSH)
|
||||||
fixes bug #160655
|
fixes bug #160655
|
||||||
remove s323 from riff, it's quicktime specific :(
|
remove s323 from riff, it's quicktime specific :(
|
||||||
|
|
|
@ -104,6 +104,10 @@ static GstStaticPadTemplate video_sink_factory =
|
||||||
"width = (int) [ 16, 4096 ], "
|
"width = (int) [ 16, 4096 ], "
|
||||||
"height = (int) [ 16, 4096 ], "
|
"height = (int) [ 16, 4096 ], "
|
||||||
"framerate = (double) [ 0, MAX ]; "
|
"framerate = (double) [ 0, MAX ]; "
|
||||||
|
"video/x-h264, "
|
||||||
|
"width = (int) [ 16, 4096 ], "
|
||||||
|
"height = (int) [ 16, 4096 ], "
|
||||||
|
"framerate = (double) [ 0, MAX ]; "
|
||||||
"video/x-dv, "
|
"video/x-dv, "
|
||||||
"width = (int) 720, "
|
"width = (int) 720, "
|
||||||
"height = (int) { 576, 480 }, "
|
"height = (int) { 576, 480 }, "
|
||||||
|
|
Loading…
Reference in a new issue