Commit eb2e4a05 authored by Julien Moutte Moutte's avatar Julien Moutte Moutte

ext/ffmpeg/Makefile.am: Fix build.

Original commit message from CVS:
2005-10-23  Julien MOUTTE  <julien@moutte.net>

* ext/ffmpeg/Makefile.am: Fix build.
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_register): Add QDM2
and TrueMotion 2.
parent 8cb186a6
2005-10-23 Julien MOUTTE <julien@moutte.net>
* ext/ffmpeg/Makefile.am: Fix build.
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_register): Add QDM2
and TrueMotion 2.
2005-10-11 Wim Taymans <wim@fluendo.com> 2005-10-11 Wim Taymans <wim@fluendo.com>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_sink_event): * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_sink_event):
......
common @ 1cb5d7b7
Subproject commit 615cf4d4506ef1ffb1f600c434fced1fa26b0f44 Subproject commit 1cb5d7b76a01c711674c752015089e70c394fa99
...@@ -13,10 +13,10 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \ ...@@ -13,10 +13,10 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) \ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) \
-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \ -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \
-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavutil \
-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec
libgstffmpeg_la_LIBADD = \ libgstffmpeg_la_LIBADD = \
$(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la \ $(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la
$(top_builddir)/gst-libs/ext/ffmpeg/libavcodec/libavcodec.la
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
......
...@@ -483,6 +483,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, ...@@ -483,6 +483,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
caps = GST_FF_VID_CAPS_NEW ("video/x-wmv", caps = GST_FF_VID_CAPS_NEW ("video/x-wmv",
"wmvversion", G_TYPE_INT, 3, NULL); "wmvversion", G_TYPE_INT, 3, NULL);
break; break;
case CODEC_ID_QDM2:
caps = GST_FF_AUD_CAPS_NEW ("audio/x-qdm2", NULL);
break;
case CODEC_ID_WS_VQA: case CODEC_ID_WS_VQA:
case CODEC_ID_IDCIN: case CODEC_ID_IDCIN:
...@@ -490,6 +493,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, ...@@ -490,6 +493,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_SMC: case CODEC_ID_SMC:
case CODEC_ID_FLIC: case CODEC_ID_FLIC:
case CODEC_ID_TRUEMOTION1: case CODEC_ID_TRUEMOTION1:
case CODEC_ID_TRUEMOTION2:
case CODEC_ID_VMDVIDEO: case CODEC_ID_VMDVIDEO:
case CODEC_ID_VMDAUDIO: case CODEC_ID_VMDAUDIO:
case CODEC_ID_MSZH: case CODEC_ID_MSZH:
...@@ -1582,6 +1586,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) ...@@ -1582,6 +1586,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
} else if (!strcmp (mimetype, "audio/x-vorbis")) { } else if (!strcmp (mimetype, "audio/x-vorbis")) {
id = CODEC_ID_VORBIS; id = CODEC_ID_VORBIS;
audio = TRUE; audio = TRUE;
} else if (!strcmp (mimetype, "audio/x-qdm2")) {
id = CODEC_ID_QDM2;
audio = TRUE;
} else if (!strcmp (mimetype, "audio/mpeg")) { } else if (!strcmp (mimetype, "audio/mpeg")) {
gint layer = 0; gint layer = 0;
gint mpegversion = 0; gint mpegversion = 0;
...@@ -1943,6 +1950,9 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id) ...@@ -1943,6 +1950,9 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
case CODEC_ID_VORBIS: case CODEC_ID_VORBIS:
name = "Vorbis audio"; name = "Vorbis audio";
break; break;
case CODEC_ID_QDM2:
name = "QDesign Music 2";
break;
case CODEC_ID_AC3: case CODEC_ID_AC3:
name = "AC-3 audio"; name = "AC-3 audio";
break; break;
...@@ -2103,6 +2113,9 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id) ...@@ -2103,6 +2113,9 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
case CODEC_ID_TRUEMOTION1: case CODEC_ID_TRUEMOTION1:
name = "Duck Truemotion video"; name = "Duck Truemotion video";
break; break;
case CODEC_ID_TRUEMOTION2:
name = "Duck Truemotion 2 video";
break;
case CODEC_ID_VMDVIDEO: case CODEC_ID_VMDVIDEO:
name = "Sierra VMD video"; name = "Sierra VMD video";
break; break;
......
...@@ -1176,7 +1176,7 @@ gst_ffmpegdec_register (GstPlugin * plugin) ...@@ -1176,7 +1176,7 @@ gst_ffmpegdec_register (GstPlugin * plugin)
/* no quasi-codecs, please */ /* no quasi-codecs, please */
if (in_plugin->id == CODEC_ID_RAWVIDEO || if (in_plugin->id == CODEC_ID_RAWVIDEO ||
(in_plugin->id >= CODEC_ID_PCM_S16LE && (in_plugin->id >= CODEC_ID_PCM_S16LE &&
in_plugin->id <= CODEC_ID_PCM_U8)) { in_plugin->id <= CODEC_ID_PCM_S24DAUD)) {
goto next; goto next;
} }
......
...@@ -733,7 +733,7 @@ gst_ffmpegenc_register (GstPlugin * plugin) ...@@ -733,7 +733,7 @@ gst_ffmpegenc_register (GstPlugin * plugin)
if (in_plugin->id == CODEC_ID_RAWVIDEO || if (in_plugin->id == CODEC_ID_RAWVIDEO ||
in_plugin->id == CODEC_ID_ZLIB || in_plugin->id == CODEC_ID_ZLIB ||
(in_plugin->id >= CODEC_ID_PCM_S16LE && (in_plugin->id >= CODEC_ID_PCM_S16LE &&
in_plugin->id <= CODEC_ID_PCM_ALAW)) { in_plugin->id <= CODEC_ID_PCM_S24DAUD)) {
goto next; goto next;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment