[SCM] libav/experimental: forgot

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:45:39 UTC 2013


The following commit has been merged in the experimental branch:
commit 2ceff404b5416035ae05caad39bbdfe56a31064a
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Dec 19 03:08:08 2005 +0000

    forgot
    
    Originally committed as revision 4756 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 743e992..393a98f 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1115,10 +1115,11 @@ int MPV_encode_init(AVCodecContext *avctx)
         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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list