[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec mpegvideo.c,1.478,1.479

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv6315

Modified Files:
	mpegvideo.c 
Log Message:
complain about mpeg4 limits only if codec_id == MPEG4


Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -d -r1.478 -r1.479
--- mpegvideo.c	2 May 2005 22:14:42 -0000	1.478
+++ mpegvideo.c	8 May 2005 00:44:06 -0000	1.479
@@ -1091,7 +1091,7 @@
         
     avcodec_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift);
 
-    if(s->avctx->time_base.den > (1<<16)-1){
+    if(avctx->codec_id == CODEC_ID_MPEG4 && s->avctx->time_base.den > (1<<16)-1){
         av_log(avctx, AV_LOG_ERROR, "timebase not supported by mpeg 4 standard\n");
         return -1;        
     }