diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2007-06-20 08:00:30 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2007-06-20 08:00:30 +0000 |
| commit | d0920a38d7eec4c73e8d61b508a1e3ae90099c3c (patch) | |
| tree | 3d94df8b6a10ea059b9d66f34f495e7c94c49d5e | |
| parent | 603caa3479a5b0e286e4a7e2eaf604ae104f59a5 (diff) | |
| download | gst-libav-d0920a38d7eec4c73e8d61b508a1e3ae90099c3c.tar.gz | |
ext/ffmpeg/gstffmpegcodecmap.c: Enable mjpeg-codec in more containers.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c:
(gst_ffmpeg_formatid_get_codecids):
Enable mjpeg-codec in more containers.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 5 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2007-06-20 Stefan Kost <ensonic@users.sf.net> + + * ext/ffmpeg/gstffmpegcodecmap.c: + (gst_ffmpeg_formatid_get_codecids): + Enable mjpeg-codec in more containers. + 2007-06-19 Stefan Kost <ensonic@users.sf.net> * ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_log_callback): diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 9e7bf33..b399779 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -1766,7 +1766,9 @@ gst_ffmpeg_formatid_get_codecids (const gchar * format_name, if (!strcmp (format_name, "mp4")) { static enum CodecID mp4_video_list[] = { - CODEC_ID_MPEG4, CODEC_ID_H263, CODEC_ID_H264, CODEC_ID_NONE + CODEC_ID_MPEG4, CODEC_ID_H263, CODEC_ID_H264, + CODEC_ID_MJPEG, + CODEC_ID_NONE }; static enum CodecID mp4_audio_list[] = { CODEC_ID_AAC, CODEC_ID_MP3, CODEC_ID_AMR_NB, CODEC_ID_AMR_WB, @@ -1838,6 +1840,7 @@ gst_ffmpeg_formatid_get_codecids (const gchar * format_name, CODEC_ID_SVQ1, CODEC_ID_SVQ3, CODEC_ID_MPEG4, CODEC_ID_H263, CODEC_ID_H263P, CODEC_ID_H264, CODEC_ID_DVVIDEO, + CODEC_ID_MJPEG, CODEC_ID_NONE }; static enum CodecID mov_audio_list[] = { |