diff options
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 3 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 61 |
3 files changed, 39 insertions, 29 deletions
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index 0bd87a8f4..350db4a4a 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.39 2004/12/16 19:26:34 tmattern Exp $ + * $Id: video_decoder.c,v 1.40 2005/04/16 23:38:09 hadess Exp $ * * xine video decoder plugin using ffmpeg * @@ -671,6 +671,7 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_3IVX, CODEC_ID_MPEG4, "ISO MPEG-4 (3ivx, ffmpeg)"}, {BUF_VIDEO_JPEG, CODEC_ID_MJPEG, "Motion JPEG (ffmpeg)"}, {BUF_VIDEO_MJPEG, CODEC_ID_MJPEG, "Motion JPEG (ffmpeg)"}, + {BUF_VIDEO_MJPEG_B, CODEC_ID_MJPEGB, "Motion JPEG B (ffmpeg"}, {BUF_VIDEO_I263, CODEC_ID_H263I, "ITU H.263 (ffmpeg)"}, {BUF_VIDEO_H263, CODEC_ID_H263, "H.263 (ffmpeg)"}, {BUF_VIDEO_RV10, CODEC_ID_RV10, "Real Video 1.0 (ffmpeg)"}, @@ -1292,6 +1293,7 @@ static uint32_t supported_video_types[] = { BUF_VIDEO_DIVX5, BUF_VIDEO_3IVX, BUF_VIDEO_MJPEG, + BUF_VIDEO_MJPEG_B, BUF_VIDEO_H263, BUF_VIDEO_RV10, BUF_VIDEO_RV20, diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 2d645c5fc..88045c2f9 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.h,v 1.146 2005/01/14 15:29:47 jstembridge Exp $ + * $Id: buffer.h,v 1.147 2005/04/16 23:38:09 hadess Exp $ * * * contents: @@ -168,6 +168,7 @@ extern "C" { #define BUF_VIDEO_BITPLANE_BR1 0x024B0000 /* the same with Bytrun compression 1 */ #define BUF_VIDEO_FLV1 0x024C0000 #define BUF_VIDEO_H264 0x024D0000 +#define BUF_VIDEO_MJPEG_B 0x024E0000 /* audio buffer types: (please keep in sync with buffer_types.c) */ diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 2c1732740..033176835 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer_types.c,v 1.94 2005/03/26 20:29:47 tmmm Exp $ + * $Id: buffer_types.c,v 1.95 2005/04/16 23:38:09 hadess Exp $ * * * contents: @@ -85,7 +85,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_MPEG4, - "ISO-MPEG4/OpenDivx format" + "ISO-MPEG4/OpenDivx" }, { { @@ -94,7 +94,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_XVID, - "XviD format" + "XviD" }, { { @@ -102,7 +102,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_DIVX5, - "DivX 5 format" + "DivX 5" }, { { @@ -110,7 +110,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_CINEPAK, - "Cinepak format" + "Cinepak" }, { { @@ -140,7 +140,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_MSMPEG4_V1, - "Microsoft MPEG-4 format v1" + "Microsoft MPEG-4 v1" }, { { @@ -153,7 +153,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_MSMPEG4_V2, - "Microsoft MPEG-4 format v2" + "Microsoft MPEG-4 v2" }, { { @@ -173,7 +173,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_MSMPEG4_V3, - "Microsoft MPEG-4 format v3" + "Microsoft MPEG-4 v3" }, { { @@ -189,13 +189,20 @@ static video_db_t video_db[] = { meFOURCC('d', 'm', 'b', '1'), meFOURCC('M', 'J', 'P', 'G'), meFOURCC('m', 'j', 'p', 'a'), - meFOURCC('m', 'j', 'p', 'b'), meFOURCC('A', 'V', 'R', 'n'), meFOURCC('A', 'V', 'D', 'J'), 0 }, BUF_VIDEO_MJPEG, - "motion jpeg format" + "Motion JPEG" +}, +{ + { + meFOURCC('m', 'j', 'p', 'b'), + 0 + }, + BUF_VIDEO_MJPEG_B, + "Motion JPEG B" }, { { @@ -204,7 +211,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_IV50, - "Indeo Video 5.0 format" + "Indeo Video 5.0" }, { { @@ -213,7 +220,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_IV41, - "Indeo Video 4.1 format" + "Indeo Video 4.1" }, { { @@ -222,7 +229,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_IV32, - "Indeo Video 3.2 format" + "Indeo Video 3.2" }, { { @@ -231,7 +238,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_IV31, - "Indeo Video 3.1 format" + "Indeo Video 3.1" }, { { @@ -239,7 +246,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_ATIVCR1, - "ATI VCR1 format" + "ATI VCR1" }, { { @@ -247,7 +254,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_ATIVCR2, - "ATI VCR2 format" + "ATI VCR2" }, { { @@ -259,7 +266,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_I263, - "I263 format" + "I263" }, { { @@ -289,7 +296,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_JPEG, - "jpeg" + "JPEG" }, { { @@ -349,7 +356,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_VP31, - "On2 VP3.1 Codec" + "On2 VP3.1" }, { { @@ -368,7 +375,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_H263, - "H263 format" + "H263" }, { { @@ -377,7 +384,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_CYUV, - "Creative YUV format" + "Creative YUV" }, { { @@ -394,7 +401,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_RPZA, - "Apple Quicktime Video (RPZA)" + "Apple Quicktime (RPZA)" }, { { @@ -433,7 +440,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_PGVV, - "Radius Studio Codec" + "Radius Studio" }, { { @@ -465,7 +472,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_GREY, - "Raw greyscale" + "Raw Greyscale" }, { { @@ -576,7 +583,7 @@ static video_db_t video_db[] = { 0, }, BUF_VIDEO_THEORA, - "OggTheora Video" + "Ogg Theora" }, { { @@ -584,7 +591,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_VP5, - "On2 VP5 Codec" + "On2 VP5" }, { { @@ -594,7 +601,7 @@ static video_db_t video_db[] = { 0 }, BUF_VIDEO_VP6, - "On2 VP6 Codec" + "On2 VP6" }, { { |