diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-01 17:56:05 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-01 17:56:05 +0000 |
| commit | 55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2 (patch) | |
| tree | a75e2ca408aa1dea4eab0ae04b34408cbc261011 /src/libffmpeg | |
| parent | e7eb5eea39cb19a939a519828be0879ba58d1805 (diff) | |
| download | xine-lib-55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2.tar.gz xine-lib-55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2.tar.bz2 | |
enable ffmpeg's msmpeg4 v1/v2.
note: i don't have any v1 streams to test. v2 are working fine though.
CVS patchset: 2189
CVS date: 2002/07/01 17:56:05
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/xine_decoder.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index 63a81d595..bf3cfa8b2 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_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: xine_decoder.c,v 1.44 2002/07/01 13:33:12 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.45 2002/07/01 17:56:05 miguelfreitas Exp $ * * xine decoder plugin using ffmpeg * @@ -68,10 +68,9 @@ typedef struct ff_decoder_s { static int ff_can_handle (video_decoder_t *this_gen, int buf_type) { buf_type &= 0xFFFF0000; - /* ffmpeg currently does not support MSMPEG4 v1/v2 */ - /* there's some problem with I263 too */ return ( buf_type == BUF_VIDEO_MSMPEG4_V3 || - /* buf_type == BUF_VIDEO_MSMPEG4_V12 || */ + buf_type == BUF_VIDEO_MSMPEG4_V2 || + buf_type == BUF_VIDEO_MSMPEG4_V1 || buf_type == BUF_VIDEO_WMV7 || buf_type == BUF_VIDEO_MPEG4 || buf_type == BUF_VIDEO_XVID || @@ -119,7 +118,12 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { codec_type = buf->type & 0xFFFF0000; switch (codec_type) { - case BUF_VIDEO_MSMPEG4_V12: + case BUF_VIDEO_MSMPEG4_V1: + codec = avcodec_find_decoder (CODEC_ID_MSMPEG4V1); + break; + case BUF_VIDEO_MSMPEG4_V2: + codec = avcodec_find_decoder (CODEC_ID_MSMPEG4V2); + break; case BUF_VIDEO_MSMPEG4_V3: codec = avcodec_find_decoder (CODEC_ID_MSMPEG4); break; |