[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec mpegvideo.c,1.493,1.494

[Michael Niedermayer CVS]

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

Modified Files:
	mpegvideo.c 
Log Message:
forgot


Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -d -r1.493 -r1.494
--- mpegvideo.c	18 Dec 2005 19:59:33 -0000	1.493
+++ mpegvideo.c	19 Dec 2005 03:08:08 -0000	1.494
@@ -1115,10 +1115,11 @@
         s->rtp_mode= 1;
         break;
     case CODEC_ID_LJPEG:
+    case CODEC_ID_JPEGLS:
     case CODEC_ID_MJPEG:
         s->out_format = FMT_MJPEG;
         s->intra_only = 1; /* force intra only for jpeg */
-        s->mjpeg_write_tables = 1; /* write all tables */
+        s->mjpeg_write_tables = avctx->codec->id != CODEC_ID_JPEGLS;
 	s->mjpeg_data_only_frames = 0; /* write all the needed headers */
         s->mjpeg_vsample[0] = 1<<chroma_v_shift;
         s->mjpeg_vsample[1] = 1;