summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-05-02 09:12:59 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-05-02 09:12:59 +0000
commit1cf3d1b49423196fe50c7cc2fa4180bf004b6dac (patch)
tree242fd8c0d10fcd29fc10de2fd4707f5a3291670c
parent710c39687f0e3107d90e33d5bf39fdcb0ce92cb9 (diff)
downloadgst-libav-1cf3d1b49423196fe50c7cc2fa4180bf004b6dac.tar.gz
ext/ffmpeg/gstffmpegcodecmap.c: Add JPEG-formatted YUV enums.
Original commit message from CVS: Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_pixfmt_to_caps): Add JPEG-formatted YUV enums.
-rw-r--r--ChangeLog7
-rw-r--r--ext/ffmpeg/gstffmpegcodecmap.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ae28a4..752be33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-02 Luca Ognibene <luogni@tin.it>
+
+ Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_pixfmt_to_caps):
+ Add JPEG-formatted YUV enums.
+
2005-05-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_class_init),
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index ba3924f..8f28b76 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -810,6 +810,7 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context)
guint32 fmt = 0;
switch (pix_fmt) {
+ case PIX_FMT_YUVJ420P:
case PIX_FMT_YUV420P:
fmt = GST_MAKE_FOURCC ('I', '4', '2', '0');
break;
@@ -830,9 +831,11 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context)
g_mask = 0x00ff00;
b_mask = 0xff0000;
break;
+ case PIX_FMT_YUVJ422P:
case PIX_FMT_YUV422P:
fmt = GST_MAKE_FOURCC ('Y', '4', '2', 'B');
break;
+ case PIX_FMT_YUVJ444P:
case PIX_FMT_YUV444P:
/* .. */
break;