summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-06-23 23:08:29 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-06-23 23:08:29 +0000
commitf255ba9393b2967d6f5b39b02ebe75e4936ed255 (patch)
treeb108fcdf1a8f7b5a0ec0011a88efdc989938d667 /src
parent06e39f2fdf2bca1722fde4d2e394c4ab9bb1bc67 (diff)
downloadxine-lib-f255ba9393b2967d6f5b39b02ebe75e4936ed255.tar.gz
xine-lib-f255ba9393b2967d6f5b39b02ebe75e4936ed255.tar.bz2
really enable wmv1 decoding this time
CVS patchset: 2144 CVS date: 2002/06/23 23:08:29
Diffstat (limited to 'src')
-rw-r--r--src/libffmpeg/xine_decoder.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index c297a99cd..a8eb4e315 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.42 2002/06/12 12:22:35 f1rmb Exp $
+ * $Id: xine_decoder.c,v 1.43 2002/06/23 23:08:29 miguelfreitas Exp $
*
* xine decoder plugin using ffmpeg
*
@@ -72,6 +72,7 @@ static int ff_can_handle (video_decoder_t *this_gen, int buf_type) {
/* there's some problem with I263 too */
return ( buf_type == BUF_VIDEO_MSMPEG4_V3 ||
/* buf_type == BUF_VIDEO_MSMPEG4_V12 || */
+ buf_type == BUF_VIDEO_WMV7 ||
buf_type == BUF_VIDEO_MPEG4 ||
buf_type == BUF_VIDEO_XVID ||
buf_type == BUF_VIDEO_DIVX5 ||
@@ -122,6 +123,9 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
case BUF_VIDEO_MSMPEG4_V3:
codec = avcodec_find_decoder (CODEC_ID_MSMPEG4);
break;
+ case BUF_VIDEO_WMV7:
+ codec = avcodec_find_decoder (CODEC_ID_WMV1);
+ break;
case BUF_VIDEO_MPEG4 :
case BUF_VIDEO_XVID :
case BUF_VIDEO_DIVX5 :