diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-05-06 04:22:50 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-05-06 04:22:50 +0000 |
| commit | e3e426cc9029ba7072bf48a4789ec04c179b63f1 (patch) | |
| tree | ceea46f00c5812f65143bbe66e7fe859e025aeab /src/libffmpeg/video_decoder.c | |
| parent | fd42eb6dec2d911a8480d7b30625b27aeb34ce6c (diff) | |
| download | xine-lib-e3e426cc9029ba7072bf48a4789ec04c179b63f1.tar.gz xine-lib-e3e426cc9029ba7072bf48a4789ec04c179b63f1.tar.bz2 | |
syncing to FFmpeg libavcodec build 4754; hook up the Indeo 2 decoder,
deploy new timebase API (pertains to MPEG-1 encoder); hopefully this
sync fixes some H.264 decoding issues as well
CVS patchset: 7523
CVS date: 2005/05/06 04:22:50
Diffstat (limited to 'src/libffmpeg/video_decoder.c')
| -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 957e9da63..103ed6eb2 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.47 2005/04/26 21:11:35 tmattern Exp $ + * $Id: video_decoder.c,v 1.48 2005/05/06 04:22:51 tmmm Exp $ * * xine video decoder plugin using ffmpeg * @@ -262,6 +262,7 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_ULTI, CODEC_ID_ULTI, "IBM UltiMotion (ffmpeg)"}, {BUF_VIDEO_WNV1, CODEC_ID_WNV1, "Winnow Video (ffmpeg)"}, {BUF_VIDEO_XL, CODEC_ID_VIXL, "Miro/Pinnacle VideoXL (ffmpeg)"}, + {BUF_VIDEO_RT21, CODEC_ID_INDEO2, "Indeo/RealTime 2 (ffmpeg)"}, {BUF_VIDEO_MPEG, CODEC_ID_MPEG1VIDEO, "MPEG 1/2 (ffmpeg)"} }; @@ -1476,6 +1477,7 @@ static uint32_t supported_video_types[] = { BUF_VIDEO_ULTI, BUF_VIDEO_WNV1, BUF_VIDEO_XL, + BUF_VIDEO_RT21, 0 }; |