updated ffmpeg

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2095 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 2 insertions, 55 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c
index f4917095b..059d8c55e 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c
@@ -975,9 +975,6 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s)
 

     if(s->lossless){

         if(CONFIG_JPEGLS_DECODER && s->ls){

-//            for(){

-//            reset_ls_coding_parameters(s, 0);

-

             if(ff_jpegls_decode_picture(s, predictor, point_transform, ilv) < 0)

                 return -1;

         }else{

@@ -1039,32 +1036,15 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
        informations, but it's always present in AVID creates files */

     if (id == AV_RL32("AVI1"))

     {

-        /* structure:

-            4bytes      AVI1

-            1bytes      polarity

-            1bytes      always zero

-            4bytes      field_size

-            4bytes      field_size_less_padding

-        */

             s->buggy_avid = 1;

-//        if (s->first_picture)

-//            printf("mjpeg: workarounding buggy AVID\n");

+

         i = get_bits(&s->gb, 8);

         if     (i==2) s->bottom_field= 1;

         else if(i==1) s->bottom_field= 0;

-#if 0

-        skip_bits(&s->gb, 8);

-        skip_bits(&s->gb, 32);

-        skip_bits(&s->gb, 32);

-        len -= 10;

-#endif

-//        if (s->interlace_polarity)

-//            printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity);

+

         goto out;

     }

 

-//    len -= 2;

-

     if (id == AV_RL32("JFIF"))

     {

         int t_w, t_h, v1, v2;

@@ -1138,16 +1118,6 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
         len -= 4;

         if (id == AV_RL32("mjpg")) /* Apple MJPEG-A */

         {

-#if 0

-            skip_bits(&s->gb, 32); /* field size */

-            skip_bits(&s->gb, 32); /* pad field size */

-            skip_bits(&s->gb, 32); /* next off */

-            skip_bits(&s->gb, 32); /* quant off */

-            skip_bits(&s->gb, 32); /* huff off */

-            skip_bits(&s->gb, 32); /* image off */

-            skip_bits(&s->gb, 32); /* scan off */

-            skip_bits(&s->gb, 32); /* data off */

-#endif

             if (s->avctx->debug & FF_DEBUG_PICT_INFO)

                 av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n");

         }

@@ -1202,29 +1172,6 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
     return 0;

 }

 

-#if 0

-static int valid_marker_list[] =

-{

-        /* 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f */

-/* 0 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 1 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 2 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 3 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 4 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 5 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 6 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 7 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 8 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* 9 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* a */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* b */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-/* c */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

-/* d */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

-/* e */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

-/* f */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,

-}

-#endif

-

 /* return the 8 bit start code value and update the search

    state. Return -1 if no start code found */

 static int find_marker(const uint8_t **pbuf_ptr, const uint8_t *buf_end)