Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 17:26:59 +0000 (19:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 17:37:09 +0000 (19:37 +0200)
* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
  h263: K&R formatting cosmetics

Conflicts:
libavcodec/h263dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h263dec.c

   * H.263 decoder.
   */
  
 +#define UNCHECKED_BITSTREAM_READER 1
 +
  #include "libavutil/cpu.h"
- #include "internal.h"
  #include "avcodec.h"
  #include "error_resilience.h"
- #include "mpegvideo.h"
+ #include "flv.h"
  #include "h263.h"
  #include "h263_parser.h"
+ #include "internal.h"
+ #include "mpeg4video.h"
  #include "mpeg4video_parser.h"
+ #include "mpegvideo.h"
  #include "msmpeg4.h"
 +#include "vdpau_internal.h"
  #include "thread.h"
- #include "flv.h"
- #include "mpeg4video.h"
  
  av_cold int ff_h263_decode_init(AVCodecContext *avctx)
  {
      MpegEncContext *s = avctx->priv_data;
 +    int ret;
  
-     s->avctx = avctx;
-     s->out_format = FMT_H263;
-     s->width  = avctx->coded_width;
-     s->height = avctx->coded_height;
-     s->workaround_bugs= avctx->workaround_bugs;
+     s->avctx           = avctx;
+     s->out_format      = FMT_H263;
+     s->width           = avctx->coded_width;
+     s->height          = avctx->coded_height;
+     s->workaround_bugs = avctx->workaround_bugs;
  
      // set defaults
      ff_MPV_decode_defaults(s);
          avctx->pix_fmt = AV_PIX_FMT_YUV420P;
      else
          avctx->pix_fmt = avctx->get_format(avctx, avctx->codec->pix_fmts);
-     s->unrestricted_mv= 1;
+     s->unrestricted_mv = 1;
  
      /* select sub codec */
-     switch(avctx->codec->id) {
+     switch (avctx->codec->id) {
      case AV_CODEC_ID_H263:
-         s->unrestricted_mv= 0;
 +    case AV_CODEC_ID_H263P:
+         s->unrestricted_mv = 0;
          avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
          break;
      case AV_CODEC_ID_MPEG4:
          s->h263_flv = 1;
          break;
      default:
 -        return -1;
 +        return AVERROR(EINVAL);
      }
-     s->codec_id= avctx->codec->id;
-     avctx->hwaccel= ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
+     s->codec_id    = avctx->codec->id;
+     avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
  
 +    if (avctx->stream_codec_tag == AV_RL32("l263") && avctx->extradata_size == 56 && avctx->extradata[0] == 1)
 +        s->ehc_mode = 1;
 +
      /* for h263, we allocate the images after having read the header */
-     if (avctx->codec->id != AV_CODEC_ID_H263 && avctx->codec->id != AV_CODEC_ID_H263P && avctx->codec->id != AV_CODEC_ID_MPEG4)
+     if (avctx->codec->id != AV_CODEC_ID_H263 &&
++        avctx->codec->id != AV_CODEC_ID_H263P &&
+         avctx->codec->id != AV_CODEC_ID_MPEG4)
 -        if (ff_MPV_common_init(s) < 0)
 -            return -1;
 +        if ((ret = ff_MPV_common_init(s)) < 0)
 +            return ret;
  
-         ff_h263_decode_init_vlc();
+     ff_h263_decode_init_vlc();
  
      return 0;
  }
@@@ -155,39 -155,38 +164,38 @@@ 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 mb_size= 16>>s->avctx->lowres;
+ static int decode_slice(MpegEncContext *s)
+ {
 -    const int part_mask = s->partitioned_frame
 -                          ? (ER_AC_END | ER_AC_ERROR) : 0x7F;
 -    const int mb_size = 16;
++    const int part_mask = s->partitioned_frame ? (ER_AC_END | ER_AC_ERROR) : 0x7F;
++    const int mb_size   = 16 >> s->avctx->lowres;
 +    int ret;
  
-     s->last_resync_gb= s->gb;
-     s->first_slice_line= 1;
-     s->resync_mb_x= s->mb_x;
-     s->resync_mb_y= s->mb_y;
+     s->last_resync_gb   = s->gb;
+     s->first_slice_line = 1;
+     s->resync_mb_x      = s->mb_x;
+     s->resync_mb_y      = s->mb_y;
  
      ff_set_qscale(s, s->qscale);
  
      if (s->avctx->hwaccel) {
-         const uint8_t *start= s->gb.buffer + get_bits_count(&s->gb)/8;
+         const uint8_t *start = s->gb.buffer + get_bits_count(&s->gb) / 8;
 -        const uint8_t *end   = ff_h263_find_resync_marker(start + 1,
 -                                                          s->gb.buffer_end);
 -        skip_bits_long(&s->gb, 8 * (end - start));
 -        return s->avctx->hwaccel->decode_slice(s->avctx, start, end - start);
 +        ret = s->avctx->hwaccel->decode_slice(s->avctx, start, s->gb.buffer_end - start);
 +        // ensure we exit decode loop
 +        s->mb_y = s->mb_height;
 +        return ret;
      }
  
-     if(s->partitioned_frame){
-         const int qscale= s->qscale;
+     if (s->partitioned_frame) {
+         const int qscale = s->qscale;
  
-         if(CONFIG_MPEG4_DECODER && s->codec_id==AV_CODEC_ID_MPEG4){
+         if (CONFIG_MPEG4_DECODER && s->codec_id == AV_CODEC_ID_MPEG4)
 -            if (ff_mpeg4_decode_partitions(s) < 0)
 -                return -1;
 +            if ((ret = ff_mpeg4_decode_partitions(s)) < 0)
 +                return ret;
-         }
  
          /* restore variables which were modified */
-         s->first_slice_line=1;
-         s->mb_x= s->resync_mb_x;
-         s->mb_y= s->resync_mb_y;
+         s->first_slice_line = 1;
+         s->mb_x             = s->resync_mb_x;
+         s->mb_y             = s->resync_mb_y;
          ff_set_qscale(s, qscale);
      }
  
                          s->mb_y++;
                      }
                      return 0;
-                 }else if(ret==SLICE_NOEND){
-                     av_log(s->avctx, AV_LOG_ERROR, "Slice mismatch at MB: %d\n", xy);
-                     ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x+1, s->mb_y, ER_MB_END&part_mask);
+                 } else if (ret == SLICE_NOEND) {
+                     av_log(s->avctx, AV_LOG_ERROR,
+                            "Slice mismatch at MB: %d\n", xy);
+                     ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                                     s->mb_x + 1, s->mb_y,
+                                     ER_MB_END & part_mask);
 -                    return -1;
 +                    return AVERROR_INVALIDDATA;
                  }
                  av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", xy);
-                 ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR&part_mask);
+                 ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                                 s->mb_x, s->mb_y, ER_MB_ERROR & part_mask);
  
 -                return -1;
 +                return AVERROR_INVALIDDATA;
              }
  
              ff_MPV_decode_mb(s, s->block);
                  ff_h263_loop_filter(s);
          }
  
-         ff_mpeg_draw_horiz_band(s, s->mb_y*mb_size, mb_size);
+         ff_mpeg_draw_horiz_band(s, s->mb_y * mb_size, mb_size);
          ff_MPV_report_decode_progress(s);
  
-         s->mb_x= 0;
+         s->mb_x = 0;
      }
  
-     av_assert1(s->mb_x==0 && s->mb_y==s->mb_height);
 -    assert(s->mb_x == 0 && s->mb_y == s->mb_height);
++    av_assert1(s->mb_x == 0 && s->mb_y == s->mb_height);
  
-     if(s->codec_id==AV_CODEC_ID_MPEG4
-        && (s->workaround_bugs&FF_BUG_AUTODETECT)
-        && get_bits_left(&s->gb) >= 48
-        && show_bits(&s->gb, 24)==0x4010
-        && !s->data_partitioning)
-         s->padding_bug_score+=32;
+     if (s->codec_id == AV_CODEC_ID_MPEG4         &&
+         (s->workaround_bugs & FF_BUG_AUTODETECT) &&
+         get_bits_left(&s->gb) >= 48              &&
+         show_bits(&s->gb, 24) == 0x4010          &&
+         !s->data_partitioning)
+         s->padding_bug_score += 32;
  
      /* try to detect the padding bug */
-     if(      s->codec_id==AV_CODEC_ID_MPEG4
-        &&   (s->workaround_bugs&FF_BUG_AUTODETECT)
-        &&    get_bits_left(&s->gb) >=0
-        &&    get_bits_left(&s->gb) < 137
- //       &&   !s->resync_marker
-        &&   !s->data_partitioning){
-         const int bits_count= get_bits_count(&s->gb);
-         const int bits_left = s->gb.size_in_bits - bits_count;
-         if(bits_left==0){
-             s->padding_bug_score+=16;
-         } else if(bits_left != 1){
-             int v= show_bits(&s->gb, 8);
-             v|= 0x7F >> (7-(bits_count&7));
-             if(v==0x7F && bits_left<=8)
+     if (s->codec_id == AV_CODEC_ID_MPEG4         &&
+         (s->workaround_bugs & FF_BUG_AUTODETECT) &&
+         get_bits_left(&s->gb) >= 0               &&
 -        get_bits_left(&s->gb) < 48               &&
++        get_bits_left(&s->gb) < 137              &&
+         // !s->resync_marker                     &&
+         !s->data_partitioning) {
+         const int bits_count = get_bits_count(&s->gb);
+         const int bits_left  = s->gb.size_in_bits - bits_count;
+         if (bits_left == 0) {
+             s->padding_bug_score += 16;
+         } else if (bits_left != 1) {
+             int v = show_bits(&s->gb, 8);
+             v |= 0x7F >> (7 - (bits_count & 7));
+             if (v == 0x7F && bits_left <= 8)
                  s->padding_bug_score--;
-             else if(v==0x7F && ((get_bits_count(&s->gb)+8)&8) && bits_left<=16)
-                 s->padding_bug_score+= 4;
+             else if (v == 0x7F && ((get_bits_count(&s->gb) + 8) & 8) &&
+                      bits_left <= 16)
+                 s->padding_bug_score += 4;
              else
                  s->padding_bug_score++;
          }
      }
  
      // handle formats which don't have unique end markers
-     if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly
-         int left= get_bits_left(&s->gb);
-         int max_extra=7;
+     if (s->msmpeg4_version || (s->workaround_bugs & FF_BUG_NO_PADDING)) { // FIXME perhaps solve this more cleanly
+         int left      = get_bits_left(&s->gb);
+         int max_extra = 7;
  
          /* no markers in M$ crap */
-         if(s->msmpeg4_version && s->pict_type==AV_PICTURE_TYPE_I)
-             max_extra+= 17;
-         /* buggy padding but the frame should still end approximately at the bitstream end */
-         if((s->workaround_bugs&FF_BUG_NO_PADDING) && (s->err_recognition&(AV_EF_BUFFER|AV_EF_AGGRESSIVE)))
-             max_extra+= 48;
-         else if((s->workaround_bugs&FF_BUG_NO_PADDING))
-             max_extra+= 256*256*256*64;
-         if(left>max_extra){
-             av_log(s->avctx, AV_LOG_ERROR, "discarding %d junk bits at end, next would be %X\n", left, show_bits(&s->gb, 24));
-         }
-         else if(left<0){
+         if (s->msmpeg4_version && s->pict_type == AV_PICTURE_TYPE_I)
+             max_extra += 17;
+         /* buggy padding but the frame should still end approximately at
+          * the bitstream end */
+         if ((s->workaround_bugs & FF_BUG_NO_PADDING) &&
 -            (s->err_recognition & AV_EF_BUFFER))
++            (s->err_recognition & (AV_EF_BUFFER|AV_EF_AGGRESSIVE)))
+             max_extra += 48;
+         else if ((s->workaround_bugs & FF_BUG_NO_PADDING))
+             max_extra += 256 * 256 * 256 * 64;
+         if (left > max_extra)
+             av_log(s->avctx, AV_LOG_ERROR,
+                    "discarding %d junk bits at end, next would be %X\n",
+                    left, show_bits(&s->gb, 24));
+         else if (left < 0)
              av_log(s->avctx, AV_LOG_ERROR, "overreading %d bits\n", -left);
-         }else
-             ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_END);
+         else
+             ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                             s->mb_x - 1, s->mb_y, ER_MB_END);
  
          return 0;
      }
  
-     av_log(s->avctx, AV_LOG_ERROR, "slice end not reached but screenspace end (%d left %06X, score= %d)\n",
-             get_bits_left(&s->gb),
-             show_bits(&s->gb, 24), s->padding_bug_score);
+     av_log(s->avctx, AV_LOG_ERROR,
+            "slice end not reached but screenspace end (%d left %06X, score= %d)\n",
+            get_bits_left(&s->gb), show_bits(&s->gb, 24), s->padding_bug_score);
  
-     ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_END&part_mask);
+     ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y,
+                     ER_MB_END & part_mask);
  
 -    return -1;
 +    return AVERROR_INVALIDDATA;
  }
  
- int ff_h263_decode_frame(AVCodecContext *avctx,
-                              void *data, int *got_frame,
-                              AVPacket *avpkt)
+ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+                          AVPacket *avpkt)
  {
      const uint8_t *buf = avpkt->data;
-     int buf_size = avpkt->size;
-     MpegEncContext *s = avctx->priv_data;
+     int buf_size       = avpkt->size;
+     MpegEncContext *s  = avctx->priv_data;
      int ret;
      AVFrame *pict = data;
  
          return 0;
      }
  
-     if(s->flags&CODEC_FLAG_TRUNCATED){
+     if (s->flags & CODEC_FLAG_TRUNCATED) {
          int next;
  
-         if(CONFIG_MPEG4_DECODER && s->codec_id==AV_CODEC_ID_MPEG4){
-             next= ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size);
-         }else if(CONFIG_H263_DECODER && s->codec_id==AV_CODEC_ID_H263){
-             next= ff_h263_find_frame_end(&s->parse_context, buf, buf_size);
-         }else if(CONFIG_H263P_DECODER && s->codec_id==AV_CODEC_ID_H263P){
-             next= ff_h263_find_frame_end(&s->parse_context, buf, buf_size);
-         }else{
-             av_log(s->avctx, AV_LOG_ERROR, "this codec does not support truncated bitstreams\n");
+         if (CONFIG_MPEG4_DECODER && s->codec_id == AV_CODEC_ID_MPEG4) {
+             next = ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size);
+         } else if (CONFIG_H263_DECODER && s->codec_id == AV_CODEC_ID_H263) {
+             next = ff_h263_find_frame_end(&s->parse_context, buf, buf_size);
++        } else if (CONFIG_H263P_DECODER && s->codec_id == AV_CODEC_ID_H263P) {
++            next = ff_h263_find_frame_end(&s->parse_context, buf, buf_size);
+         } else {
+             av_log(s->avctx, AV_LOG_ERROR,
+                    "this codec does not support truncated bitstreams\n");
 -            return -1;
 +            return AVERROR(EINVAL);
          }
  
-         if( ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 )
+         if (ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf,
+                              &buf_size) < 0)
              return buf_size;
      }
  
 +retry:
-     if(s->divx_packed && s->bitstream_buffer_size){
++    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){
++        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;
++                    s->bitstream_buffer_size = 0;
 +                }
 +                break;
 +            }
 +        }
 +    }
 +
-     if(s->bitstream_buffer_size && (s->divx_packed || buf_size<20)){ //divx 5.01+/xvid frame reorder
+     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
+     else
 -        init_get_bits(&s->gb, buf, buf_size * 8);
 +        ret = init_get_bits8(&s->gb, buf, buf_size);
-     s->bitstream_buffer_size=0;
++
+     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
+     if (!s->context_initialized)
 -        if (ff_MPV_common_init(s) < 0) // we need the idct permutaton for reading a custom matrix
 -            return -1;
++        if ((ret = ff_MPV_common_init(s)) < 0) // we need the idct permutaton for reading a custom matrix
 +            return ret;
-     }
  
      /* We need to set current_picture_ptr before reading the header,
       * otherwise we cannot store anyting in there */
      } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) {
          ret = ff_msmpeg4_decode_picture_header(s);
      } else if (CONFIG_MPEG4_DECODER && s->h263_pred) {
-         if(s->avctx->extradata_size && s->picture_number==0){
+         if (s->avctx->extradata_size && s->picture_number == 0) {
              GetBitContext gb;
  
 -            init_get_bits(&gb, s->avctx->extradata,
 -                          s->avctx->extradata_size * 8);
 -            ret = ff_mpeg4_decode_picture_header(s, &gb);
 +            if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 )
 +                ret = ff_mpeg4_decode_picture_header(s, &gb);
          }
          ret = ff_mpeg4_decode_picture_header(s, &s->gb);
      } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) {
          ret = ff_h263_decode_picture_header(s);
      }
  
-     if (ret < 0 || ret==FRAME_SKIPPED) {
++    if (ret < 0 || ret == FRAME_SKIPPED) {
 +        if (   s->width  != avctx->coded_width
 +            || s->height != avctx->coded_height) {
 +                av_log(s->avctx, AV_LOG_WARNING, "Reverting picture dimensions change due to header decoding failure\n");
 +                s->width = avctx->coded_width;
 +                s->height= avctx->coded_height;
 +        }
 +    }
-     if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size);
+     if (ret == FRAME_SKIPPED)
+         return get_consumed_bytes(s, buf_size);
  
      /* skip if the header was thrashed */
-     if (ret < 0){
+     if (ret < 0) {
          av_log(s->avctx, AV_LOG_ERROR, "header damaged\n");
 -        return -1;
 +        return ret;
      }
  
-     avctx->has_b_frames= !s->low_delay;
+     avctx->has_b_frames = !s->low_delay;
  
-     if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){
-         if(s->stream_codec_tag == AV_RL32("XVID") ||
-            s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") ||
-            s->codec_tag == AV_RL32("RMP4") || s->codec_tag == AV_RL32("ZMP4") ||
-            s->codec_tag == AV_RL32("SIPP")
-            )
-             s->xvid_build= 0;
+     if (s->xvid_build == -1 && s->divx_version == -1 && s->lavc_build == -1) {
+         if (s->stream_codec_tag == AV_RL32("XVID") ||
+             s->codec_tag        == AV_RL32("XVID") ||
+             s->codec_tag        == AV_RL32("XVIX") ||
+             s->codec_tag        == AV_RL32("RMP4") ||
+             s->codec_tag        == AV_RL32("ZMP4") ||
+             s->codec_tag        == AV_RL32("SIPP"))
+             s->xvid_build = 0;
  #if 0
-         if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1
-            && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc
-             s->xvid_build= 0;
+         if (s->codec_tag == AV_RL32("DIVX") && s->vo_type == 0 &&
+             s->vol_control_parameters == 1 &&
+             s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc
+             s->xvid_build = 0;
  #endif
      }
  
          SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c)
      }
  
-     if(avctx->debug & FF_DEBUG_BUGS)
-         av_log(s->avctx, AV_LOG_DEBUG, "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n",
-                s->workaround_bugs, s->lavc_build, s->xvid_build, s->divx_version, s->divx_build,
-                s->divx_packed ? "p" : "");
+     if (avctx->debug & FF_DEBUG_BUGS)
+         av_log(s->avctx, AV_LOG_DEBUG,
+                "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n",
+                s->workaround_bugs, s->lavc_build, s->xvid_build,
+                s->divx_version, s->divx_build, s->divx_packed ? "p" : "");
  
  #if HAVE_MMX
-     if (s->codec_id == AV_CODEC_ID_MPEG4 && s->xvid_build>=0 && avctx->idct_algo == FF_IDCT_AUTO && (av_get_cpu_flags() & AV_CPU_FLAG_MMX)) {
-         avctx->idct_algo= FF_IDCT_XVIDMMX;
+     if (s->codec_id == AV_CODEC_ID_MPEG4 && s->xvid_build >= 0 &&
+         avctx->idct_algo == FF_IDCT_AUTO &&
+         (av_get_cpu_flags() & AV_CPU_FLAG_MMX)) {
+         avctx->idct_algo = FF_IDCT_XVIDMMX;
          ff_dct_common_init(s);
 -        s->picture_number = 0;
 +        goto retry;
      }
  #endif
  
      if (s->last_picture_ptr == NULL &&
          (s->pict_type == AV_PICTURE_TYPE_B || s->droppable))
          return get_consumed_bytes(s, buf_size);
-     if(   (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B)
-        || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I)
-        ||  avctx->skip_frame >= AVDISCARD_ALL)
+     if ((avctx->skip_frame >= AVDISCARD_NONREF &&
+          s->pict_type == AV_PICTURE_TYPE_B)    ||
+         (avctx->skip_frame >= AVDISCARD_NONKEY &&
+          s->pict_type != AV_PICTURE_TYPE_I)    ||
+         avctx->skip_frame >= AVDISCARD_ALL)
          return get_consumed_bytes(s, buf_size);
  
-     if(s->next_p_frame_damaged){
-         if(s->pict_type==AV_PICTURE_TYPE_B)
+     if (s->next_p_frame_damaged) {
+         if (s->pict_type == AV_PICTURE_TYPE_B)
              return get_consumed_bytes(s, buf_size);
          else
-             s->next_p_frame_damaged=0;
+             s->next_p_frame_damaged = 0;
      }
  
-     if((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){
-         s->me.qpel_put= s->dsp.put_qpel_pixels_tab;
-         s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab;
-     }else{
-         s->me.qpel_put= s->dsp.put_no_rnd_qpel_pixels_tab;
-         s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab;
+     if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) {
+         s->me.qpel_put = s->dsp.put_qpel_pixels_tab;
+         s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab;
+     } else {
+         s->me.qpel_put = s->dsp.put_no_rnd_qpel_pixels_tab;
+         s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab;
      }
  
 -    if (ff_MPV_frame_start(s, avctx) < 0)
 -        return -1;
 +    if ((ret = ff_MPV_frame_start(s, avctx)) < 0)
 +        return ret;
  
      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->start_frame(avctx, s->gb.buffer,
 -                                        s->gb.buffer_end - s->gb.buffer) < 0)
 -            return -1;
+     if (avctx->hwaccel)
-     }
++        if ((ret = avctx->hwaccel->start_frame(avctx, s->gb.buffer,
++                                               s->gb.buffer_end - s->gb.buffer)) < 0)
 +            return ret;
  
      ff_mpeg_er_frame_start(s);
  
-     //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type
-     //which is not available before ff_MPV_frame_start()
-     if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5){
+     /* the second part of the wmv2 header contains the MB skip bits which
+      * are stored in current_picture->mb_type which is not available before
+      * ff_MPV_frame_start() */
+     if (CONFIG_WMV2_DECODER && s->msmpeg4_version == 5) {
          ret = ff_wmv2_decode_secondary_picture_header(s);
-         if(ret<0) return ret;
-         if(ret==1) goto frame_end;
+         if (ret < 0)
+             return ret;
+         if (ret == 1)
 -            goto intrax8_decoded;
++            goto frame_end;
      }
  
      /* decode each macroblock */
                  s->er.error_occurred = 1;
          }
  
-         if(s->msmpeg4_version<4 && s->h263_pred)
+         if (s->msmpeg4_version < 4 && s->h263_pred)
              ff_mpeg4_clean_buffers(s);
  
-         if (decode_slice(s) < 0) ret = AVERROR_INVALIDDATA;
+         if (decode_slice(s) < 0)
+             ret = AVERROR_INVALIDDATA;
      }
  
-     if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type==AV_PICTURE_TYPE_I)
-         if(!CONFIG_MSMPEG4_DECODER || ff_msmpeg4_decode_ext_header(s, buf_size) < 0){
+     if (s->msmpeg4_version && s->msmpeg4_version < 4 &&
+         s->pict_type == AV_PICTURE_TYPE_I)
+         if (!CONFIG_MSMPEG4_DECODER ||
+             ff_msmpeg4_decode_ext_header(s, buf_size) < 0)
              s->er.error_status_table[s->mb_num - 1] = ER_MB_ERROR;
-         }
  
-     av_assert1(s->bitstream_buffer_size==0);
 -    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 (avctx->hwaccel)
 +        if ((ret = avctx->hwaccel->end_frame(avctx)) < 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= s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb)>>3);
-         int startcode_found=0;
+     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 > 7){
 -        if (buf_size - current_pos > 5) {
++        if (buf_size - current_pos > 7) {
              int i;
-             for(i=current_pos; i<buf_size-4; i++){
-                 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){
-                     startcode_found=!(buf[i+4]&0x40);
 -            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 &&
+                     buf[i + 3] == 0xB6) {
 -                    startcode_found = 1;
++                    startcode_found = !(buf[i + 4] & 0x40);
                      break;
                  }
-             }
          }
 -        if (s->gb.buffer == s->bitstream_buffer && buf_size > 7 &&
 -            s->xvid_build >= 0) {       // xvid style
 -            startcode_found = 1;
 -            current_pos     = 0;
 -        }
  
-         if(startcode_found){
-             av_fast_malloc(
-                 &s->bitstream_buffer,
-                 &s->allocated_bitstream_buffer_size,
-                 buf_size - current_pos + FF_INPUT_BUFFER_PADDING_SIZE);
+         if (startcode_found) {
+             av_fast_malloc(&s->bitstream_buffer,
+                            &s->allocated_bitstream_buffer_size,
+                            buf_size - current_pos +
+                            FF_INPUT_BUFFER_PADDING_SIZE);
              if (!s->bitstream_buffer)
                  return AVERROR(ENOMEM);
-             memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos);
-             s->bitstream_buffer_size= buf_size - current_pos;
+             memcpy(s->bitstream_buffer, buf + current_pos,
+                    buf_size - current_pos);
+             s->bitstream_buffer_size = buf_size - current_pos;
          }
      }
  
      } else if (s->last_picture_ptr != NULL) {
          if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
              return ret;
 -        ff_print_debug_info(s, s->last_picture_ptr);
 +        ff_print_debug_info(s, s->last_picture_ptr, pict);
 +        ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1);
      }
  
-     if(s->last_picture_ptr || s->low_delay){
 -    if (s->last_picture_ptr || s->low_delay)
++    if (s->last_picture_ptr || s->low_delay) {
 +        if (   pict->format == AV_PIX_FMT_YUV420P
 +            && (s->codec_tag == AV_RL32("GEOV") || s->codec_tag == AV_RL32("GEOX"))) {
 +            int x, y, p;
 +            av_frame_make_writable(pict);
 +            for (p=0; p<3; p++) {
 +                int w = FF_CEIL_RSHIFT(pict-> width, !!p);
 +                int h = FF_CEIL_RSHIFT(pict->height, !!p);
 +                int linesize = pict->linesize[p];
 +                for (y=0; y<(h>>1); y++)
 +                    for (x=0; x<w; x++)
 +                        FFSWAP(int,
 +                               pict->data[p][x + y*linesize],
 +                               pict->data[p][x + (h-1-y)*linesize]);
 +            }
 +        }
          *got_frame = 1;
 +    }
  
-     return (ret && (avctx->err_recognition & AV_EF_EXPLODE))?ret:get_consumed_bytes(s, buf_size);
+     if (ret && (avctx->err_recognition & AV_EF_EXPLODE))
+         return ret;
+     else
+         return get_consumed_bytes(s, buf_size);
  }
  
  const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {