diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2005-04-16 23:38:09 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2005-04-16 23:38:09 +0000 |
| commit | 70a5c3f4818821a970e7caa1875ccfb8f6a551f5 (patch) | |
| tree | cca75e0ab21c416cec41dddcf7844c3eb634a15d /src/libffmpeg | |
| parent | f1014c20bdc0aa2395bcc05371c859bfce30361d (diff) | |
| download | xine-lib-70a5c3f4818821a970e7caa1875ccfb8f6a551f5.tar.gz xine-lib-70a5c3f4818821a970e7caa1875ccfb8f6a551f5.tar.bz2 | |
- Add support for the MJPEG-B format fixes playback of aqt_480p_mjpb.mov
(kind of, our ffmpeg seems to be quite old, at least the right decoder
is being used)
- Changed the descriptions of some codecs, removed the redundant "video",
"codec" or "format" words
CVS patchset: 7459
CVS date: 2005/04/16 23:38:09
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 4 |
1 files changed, 3 insertions, 1 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, |