X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fmjpeg.c;h=a2362df9dc5ffc3b2dd1a1cf1248aa26ddcf35e0;hp=ed6016f9390fbf8de75cca09df6d1e407e0ab051;hb=efb0c399caa3be581a6c605cefd35f7560f3d740;hpb=b966340546c84dfaf83bbaa1d5f8c8570eb8a2f3 diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index ed6016f939..a2362df9dc 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -2044,6 +2044,8 @@ static int mjpeg_decode_frame(AVCodecContext *avctx, uint8_t x = *(src++); *(dst++) = x; + if (avctx->codec_id != CODEC_ID_THP) + { if (x == 0xff) { while(srcgb, s->buffer, (dst - s->buffer)*8); @@ -2583,6 +2586,19 @@ AVCodec mjpeg_decoder = { NULL }; +AVCodec thp_decoder = { + "thp", + CODEC_TYPE_VIDEO, + CODEC_ID_THP, + sizeof(MJpegDecodeContext), + mjpeg_decode_init, + NULL, + mjpeg_decode_end, + mjpeg_decode_frame, + CODEC_CAP_DR1, + NULL +}; + AVCodec mjpegb_decoder = { "mjpegb", CODEC_TYPE_VIDEO,