ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavcodec/mjpegdec.c

 /*
  * MJPEG decoder
  * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2003 Alex Beregszaszi
  * Copyright (c) 2003-2004 Michael Niedermayer
  *
  * Support for external huffman table, various fixes (AVID workaround),
  * aspecting, new decode_frame mechanism and apple mjpeg-b support
  *                                  by Alex Beregszaszi
  *
@@ skipping 201 matching lines @@
     }
 
     height = get_bits(&s->gb, 16);
     width = get_bits(&s->gb, 16);
 
     //HACK for odd_height.mov
     if(s->interlaced && s->width == width && s->height == height + 1)
         height= s->height;
 
     av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height);
-    if(av_check_image_size(width, height, 0, s->avctx))
+    if(av_image_check_size(width, height, 0, s->avctx))
         return -1;
 
     nb_components = get_bits(&s->gb, 8);
     if (nb_components <= 0 ||
         nb_components > MAX_COMPONENTS)
         return -1;
     if (s->ls && !(s->bits <= 8 || nb_components == 1)){
         av_log(s->avctx, AV_LOG_ERROR, "only <= 8 bits/component or 16-bit gray accepted for JPEG-LS\n");
         return -1;
     }
@@ skipping 787 matching lines @@
 static int mjpeg_decode_app(MJpegDecodeContext *s)
 {
     int len, id, i;
 
     len = get_bits(&s->gb, 16);
     if (len < 5)
         return -1;
     if(8*len + get_bits_count(&s->gb) > s->gb.size_in_bits)
         return -1;
 
-    id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
+    id = get_bits_long(&s->gb, 32);
     id = av_be2ne32(id);
     len -= 6;
 
     if(s->avctx->debug & FF_DEBUG_STARTCODE){
         av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id);
     }
 
     /* buggy AVID, it puts EOI only at every 10th frame */
     /* also this fourcc is used by non-avid files too, it holds some
        informations, but it's always present in AVID creates files */
@@ skipping 86 matching lines @@
         default:
             av_log(s->avctx, AV_LOG_ERROR, "unknown colorspace\n");
         }
         len -= 9;
         goto out;
     }
 
     /* Apple MJPEG-A */
     if ((s->start_code == APP1) && (len > (0x28 - 8)))
     {
-        id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
+        id = get_bits_long(&s->gb, 32);
         id = av_be2ne32(id);
         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 */
@@ skipping 406 matching lines @@
     sizeof(MJpegDecodeContext),
     ff_mjpeg_decode_init,
     NULL,
     ff_mjpeg_decode_end,
     ff_mjpeg_decode_frame,
     CODEC_CAP_DR1,
     NULL,
     .max_lowres = 3,
     .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"),
 };