Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'

* commit '0749314886390f6ec81d45e0ba424fcb36c945cf':
  h263: Return meaningful errors

Conflicts:
	libavcodec/h263dec.c

See: 7b62d3415e8e44618cb97775567d453295c4f4d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/h263dec.c
index 7db32e76de0fe0419d6b730b2756511bf1c8212b,a1c7b00cb822017634a73aa5c03ba502e3b3a622..e2fb199dd28d77ce406396db498503e779975df8
--- 1/libavcodec/h263dec.c
--- 2/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@@ -166,8 -160,9 +168,9 @@@ static int get_consumed_bytes(MpegEncCo
  
  static int decode_slice(MpegEncContext *s)
  {
-     const int part_mask = s->partitioned_frame ? (ER_AC_END | ER_AC_ERROR) : 0x7F;
+     const int part_mask = s->partitioned_frame
+                           ? (ER_AC_END | ER_AC_ERROR) : 0x7F;
 -    const int mb_size = 16;
 +    const int mb_size   = 16 >> s->avctx->lowres;
      int ret;
  
      s->last_resync_gb   = s->gb;
@@@ -411,31 -404,16 +414,32 @@@ int ff_h263_decode_frame(AVCodecContex
              return buf_size;
      }
  
 +retry:
 +    if (s->divx_packed && s->bitstream_buffer_size) {
 +        int i;
 +        for(i=0; i < buf_size-3; i++) {
 +            if (buf[i]==0 && buf[i+1]==0 && buf[i+2]==1) {
 +                if (buf[i+3]==0xB0) {
 +                    av_log(s->avctx, AV_LOG_WARNING, "Discarding excessive bitstream in packed xvid\n");
 +                    s->bitstream_buffer_size = 0;
 +                }
 +                break;
 +            }
 +        }
 +    }
 +
      if (s->bitstream_buffer_size && (s->divx_packed || buf_size < 20)) // divx 5.01+/xvid frame reorder
 -        init_get_bits(&s->gb, s->bitstream_buffer,
 -                      s->bitstream_buffer_size * 8);
 +        ret = init_get_bits8(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size);
      else
 -        init_get_bits(&s->gb, buf, buf_size * 8);
 +        ret = init_get_bits8(&s->gb, buf, buf_size);
 +
      s->bitstream_buffer_size = 0;
 +    if (ret < 0)
 +        return ret;
  
      if (!s->context_initialized)
-         if ((ret = ff_MPV_common_init(s)) < 0) // we need the idct permutaton for reading a custom matrix
+         // we need the idct permutaton for reading a custom matrix
+         if ((ret = ff_MPV_common_init(s)) < 0)
              return ret;
  
      /* We need to set current_picture_ptr before reading the header,
@@@ -671,15 -642,12 +675,17 @@@
      if (!s->divx_packed && !avctx->hwaccel)
          ff_thread_finish_setup(avctx);
  
-     if (avctx->hwaccel)
-         if ((ret = avctx->hwaccel->start_frame(avctx, s->gb.buffer,
-                                                s->gb.buffer_end - s->gb.buffer)) < 0)
 +    if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)) {
 +        ff_vdpau_mpeg4_decode_picture(s, s->gb.buffer, s->gb.buffer_end - s->gb.buffer);
 +        goto frame_end;
 +    }
 +
+     if (avctx->hwaccel) {
+         ret = avctx->hwaccel->start_frame(avctx, s->gb.buffer,
+                                           s->gb.buffer_end - s->gb.buffer);
+         if (ret < 0 )
              return ret;
+     }
  
      ff_mpeg_er_frame_start(s);
  
@@@ -725,26 -693,15 +731,28 @@@
              ff_msmpeg4_decode_ext_header(s, buf_size) < 0)
              s->er.error_status_table[s->mb_num - 1] = ER_MB_ERROR;
  
 -    assert(s->bitstream_buffer_size == 0);
 -    /* divx 5.01+ bistream reorder stuff */
 +    av_assert1(s->bitstream_buffer_size == 0);
 +frame_end:
 +    ff_er_frame_end(&s->er);
 +
-     if (avctx->hwaccel)
-         if ((ret = avctx->hwaccel->end_frame(avctx)) < 0)
++    if (avctx->hwaccel) {
++        ret = avctx->hwaccel->end_frame(avctx);
++        if (ret < 0)
 +            return ret;
++    }
 +
 +    ff_MPV_frame_end(s);
 +
 +    /* divx 5.01+ bitstream reorder stuff */
 +    /* Since this clobbers the input buffer and hwaccel codecs still need the
 +     * data during hwaccel->end_frame we should not do this any earlier */
      if (s->codec_id == AV_CODEC_ID_MPEG4 && s->divx_packed) {
 -        int current_pos     = get_bits_count(&s->gb) >> 3;
 +        int current_pos     = s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb) >> 3);
          int startcode_found = 0;
  
 -        if (buf_size - current_pos > 5) {
 +        if (buf_size - current_pos > 7) {
              int i;
 -            for (i = current_pos; i < buf_size - 3; i++)
 +            for (i = current_pos; i < buf_size - 4; i++)
                  if (buf[i]     == 0 &&
                      buf[i + 1] == 0 &&
                      buf[i + 2] == 1 &&