From: Wim Taymans <wim.taymans@gmail.com>
Date: Tue, 7 Jan 2003 20:42:56 +0000 (+0000)
Subject: Add missing codecs
X-Git-Tag: BRANCH-GSTREAMER-0_6-ROOT~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc46630cb23bc8884e52f7fb52ee4985310f9b34;p=platform%2Fupstream%2Fgst-libav.git

Add missing codecs

Original commit message from CVS:
Add missing codecs
---

diff --git a/common b/common
index 4a7bc52..86c5084 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 4a7bc52a893bdd9fefa9fabe460c827822a9e0f2
+Subproject commit 86c508421de359776c4c2cb411a78c729330a250
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 2af4114..eaaa767 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -77,6 +77,11 @@ gst_ffmpegcodec_codec_context_to_caps (AVCodecContext *context, int codec_id)
 		           "video/x-mjpeg",
 			   NULL);
       break;
+    case CODEC_ID_MJPEGB:
+      return GST_CAPS_NEW ("ffmpeg_mjpeg",
+		           "video/x-mjpegb",
+			   NULL);
+      break;
     case CODEC_ID_MPEG4:
       if (context) {
         return GST_CAPS_NEW ("ffmpeg_mpeg4",
@@ -229,6 +234,11 @@ gst_ffmpegcodec_codec_context_to_caps (AVCodecContext *context, int codec_id)
 		           "unkown/unkown",
 			   NULL);
       break;
+    case CODEC_ID_HUFFYUV:
+      return GST_CAPS_NEW ("ffmpeg_huffyuv",
+		           "video/x-huffyuv",
+			   NULL);
+      break;
     /* various pcm "codecs" */
     case CODEC_ID_PCM_S16LE:
       return GST_CAPS_NEW ("ffmpeg_s16le",