]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 18:47:14 +0000 (20:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 18:47:14 +0000 (20:47 +0200)
* commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25':
  mpegvideo: Move ER functions to a separate file

Conflicts:
libavcodec/mpegvideo.c

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

diff --combined libavcodec/mpeg_er.c
index 3d90582db3518f666ecb991cd66cd214b9faad9d,9410b27616e15aa7f71e51cd98209fc150feaee0..dd87ae9cc9e6fd2a18b69cea1379ae8cebd799f4
@@@ -1,18 -1,18 +1,18 @@@
  /*
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -24,7 -24,6 +24,7 @@@ static void set_erpic(ERPicture *dst, P
  {
      int i;
  
 +    memset(dst, 0, sizeof(*dst));
      if (!src) {
          dst->f  = NULL;
          dst->tf = NULL;
@@@ -58,3 -57,74 +58,74 @@@ void ff_mpeg_er_frame_start(MpegEncCont
  
      ff_er_frame_start(er);
  }
+ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
+                               int (*mv)[2][4][2], int mb_x, int mb_y,
+                               int mb_intra, int mb_skipped)
+ {
+     MpegEncContext *s = opaque;
+     s->mv_dir     = mv_dir;
+     s->mv_type    = mv_type;
+     s->mb_intra   = mb_intra;
+     s->mb_skipped = mb_skipped;
+     s->mb_x       = mb_x;
+     s->mb_y       = mb_y;
+     memcpy(s->mv, mv, sizeof(*mv));
+     ff_init_block_index(s);
+     ff_update_block_index(s);
+     s->bdsp.clear_blocks(s->block[0]);
+     s->dest[0] = s->current_picture.f->data[0] +
+                  s->mb_y * 16 * s->linesize +
+                  s->mb_x * 16;
+     s->dest[1] = s->current_picture.f->data[1] +
+                  s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize +
+                  s->mb_x * (16 >> s->chroma_x_shift);
+     s->dest[2] = s->current_picture.f->data[2] +
+                  s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize +
+                  s->mb_x * (16 >> s->chroma_x_shift);
+     if (ref)
+         av_log(s->avctx, AV_LOG_DEBUG,
+                "Interlaced error concealment is not fully implemented\n");
+     ff_mpv_decode_mb(s, s->block);
+ }
+ int ff_mpeg_er_init(MpegEncContext *s)
+ {
+     ERContext *er = &s->er;
+     int mb_array_size = s->mb_height * s->mb_stride;
+     int i;
+     er->avctx       = s->avctx;
+     er->mb_index2xy = s->mb_index2xy;
+     er->mb_num      = s->mb_num;
+     er->mb_width    = s->mb_width;
+     er->mb_height   = s->mb_height;
+     er->mb_stride   = s->mb_stride;
+     er->b8_stride   = s->b8_stride;
+     er->er_temp_buffer     = av_malloc(s->mb_height * s->mb_stride);
+     er->error_status_table = av_mallocz(mb_array_size);
+     if (!er->er_temp_buffer || !er->error_status_table)
+         goto fail;
+     er->mbskip_table  = s->mbskip_table;
+     er->mbintra_table = s->mbintra_table;
+     for (i = 0; i < FF_ARRAY_ELEMS(s->dc_val); i++)
+         er->dc_val[i] = s->dc_val[i];
+     er->decode_mb = mpeg_er_decode_mb;
+     er->opaque    = s;
+     return 0;
+ fail:
+     av_freep(&er->er_temp_buffer);
+     av_freep(&er->error_status_table);
+     return AVERROR(ENOMEM);
+ }
diff --combined libavcodec/mpeg_er.h
index bd74fbb0c8e2b696491fdc971d81aa869f8c67ce,ca1ea9016559e424717870cff150a7c4929cf410..bb627a4d06b9f76a103f8e277af6a5d910064f5d
@@@ -1,18 -1,18 +1,18 @@@
  /*
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -21,6 -21,7 +21,7 @@@
  
  #include "mpegvideo.h"
  
+ int ff_mpeg_er_init(MpegEncContext *s);
  void ff_mpeg_er_frame_start(MpegEncContext *s);
  
  #endif /* AVCODEC_MPEG_ER_H */
diff --combined libavcodec/mpegvideo.c
index 2b01d7bb727b67f11914f39e988ea7b94b25fd74,2e8fb89c1dd30fb9e18f566d377afd432aae3571..a3ff7460e9085af351d78c18931b673f973ac53a
@@@ -5,20 -5,20 +5,20 @@@
   *
   * 4MV & hq & B-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
  #include "libavutil/avassert.h"
  #include "libavutil/imgutils.h"
  #include "libavutil/internal.h"
 +#include "libavutil/motion_vector.h"
  #include "libavutil/timer.h"
  #include "avcodec.h"
  #include "blockdsp.h"
 +#include "h264chroma.h"
  #include "idctdsp.h"
  #include "internal.h"
  #include "mathops.h"
+ #include "mpeg_er.h"
  #include "mpegutils.h"
  #include "mpegvideo.h"
  #include "mpegvideodata.h"
  #include "mjpegenc.h"
  #include "msmpeg4.h"
  #include "qpeldsp.h"
 -#include "xvmc_internal.h"
  #include "thread.h"
  #include "wmv2.h"
  #include <limits.h>
@@@ -57,7 -57,10 +58,7 @@@ static void dct_unquantize_mpeg1_intra_
  
      nCoeffs= s->block_last_index[n];
  
 -    if (n < 4)
 -        block[0] = block[0] * s->y_dc_scale;
 -    else
 -        block[0] = block[0] * s->c_dc_scale;
 +    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
      /* XXX: only mpeg1 */
      quant_matrix = s->intra_matrix;
      for(i=1;i<=nCoeffs;i++) {
@@@ -116,7 -119,10 +117,7 @@@ static void dct_unquantize_mpeg2_intra_
      if(s->alternate_scan) nCoeffs= 63;
      else nCoeffs= s->block_last_index[n];
  
 -    if (n < 4)
 -        block[0] = block[0] * s->y_dc_scale;
 -    else
 -        block[0] = block[0] * s->c_dc_scale;
 +    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
      quant_matrix = s->intra_matrix;
      for(i=1;i<=nCoeffs;i++) {
          int j= s->intra_scantable.permutated[i];
@@@ -144,8 -150,10 +145,8 @@@ static void dct_unquantize_mpeg2_intra_
      if(s->alternate_scan) nCoeffs= 63;
      else nCoeffs= s->block_last_index[n];
  
 -    if (n < 4)
 -        block[0] = block[0] * s->y_dc_scale;
 -    else
 -        block[0] = block[0] * s->c_dc_scale;
 +    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
 +    sum += block[0];
      quant_matrix = s->intra_matrix;
      for(i=1;i<=nCoeffs;i++) {
          int j= s->intra_scantable.permutated[i];
@@@ -202,12 -210,15 +203,12 @@@ static void dct_unquantize_h263_intra_c
      int i, level, qmul, qadd;
      int nCoeffs;
  
 -    assert(s->block_last_index[n]>=0);
 +    av_assert2(s->block_last_index[n]>=0 || s->h263_aic);
  
      qmul = qscale << 1;
  
      if (!s->h263_aic) {
 -        if (n < 4)
 -            block[0] = block[0] * s->y_dc_scale;
 -        else
 -            block[0] = block[0] * s->c_dc_scale;
 +        block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
          qadd = (qscale - 1) | 1;
      }else{
          qadd = 0;
@@@ -236,7 -247,7 +237,7 @@@ static void dct_unquantize_h263_inter_c
      int i, level, qmul, qadd;
      int nCoeffs;
  
 -    assert(s->block_last_index[n]>=0);
 +    av_assert2(s->block_last_index[n]>=0);
  
      qadd = (qscale - 1) | 1;
      qmul = qscale << 1;
      }
  }
  
- static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
-                               int (*mv)[2][4][2],
-                               int mb_x, int mb_y, int mb_intra, int mb_skipped)
- {
-     MpegEncContext *s = opaque;
-     s->mv_dir     = mv_dir;
-     s->mv_type    = mv_type;
-     s->mb_intra   = mb_intra;
-     s->mb_skipped = mb_skipped;
-     s->mb_x       = mb_x;
-     s->mb_y       = mb_y;
-     memcpy(s->mv, mv, sizeof(*mv));
-     ff_init_block_index(s);
-     ff_update_block_index(s);
-     s->bdsp.clear_blocks(s->block[0]);
-     s->dest[0] = s->current_picture.f->data[0] + (s->mb_y *  16                       * s->linesize)   + s->mb_x *  16;
-     s->dest[1] = s->current_picture.f->data[1] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift);
-     s->dest[2] = s->current_picture.f->data[2] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift);
-     if (ref)
-         av_log(s->avctx, AV_LOG_DEBUG,
-                "Interlaced error concealment is not fully implemented\n");
-     ff_mpv_decode_mb(s, s->block);
- }
 +
 +static void gray16(uint8_t *dst, const uint8_t *src, ptrdiff_t linesize, int h)
 +{
 +    while(h--)
 +        memset(dst + h*linesize, 128, 16);
 +}
 +
 +static void gray8(uint8_t *dst, const uint8_t *src, ptrdiff_t linesize, int h)
 +{
 +    while(h--)
 +        memset(dst + h*linesize, 128, 8);
 +}
 +
  /* init common dct for both encoder and decoder */
  static av_cold int dct_init(MpegEncContext *s)
  {
      ff_blockdsp_init(&s->bdsp, s->avctx);
 +    ff_h264chroma_init(&s->h264chroma, 8); //for lowres
      ff_hpeldsp_init(&s->hdsp, s->avctx->flags);
      ff_mpegvideodsp_init(&s->mdsp);
      ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample);
  
 +    if (s->avctx->debug & FF_DEBUG_NOMC) {
 +        int i;
 +        for (i=0; i<4; i++) {
 +            s->hdsp.avg_pixels_tab[0][i] = gray16;
 +            s->hdsp.put_pixels_tab[0][i] = gray16;
 +            s->hdsp.put_no_rnd_pixels_tab[0][i] = gray16;
 +
 +            s->hdsp.avg_pixels_tab[1][i] = gray8;
 +            s->hdsp.put_pixels_tab[1][i] = gray8;
 +            s->hdsp.put_no_rnd_pixels_tab[1][i] = gray8;
 +        }
 +    }
 +
      s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c;
      s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c;
      s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c;
      if (HAVE_INTRINSICS_NEON)
          ff_mpv_common_init_neon(s);
  
 +    if (ARCH_ALPHA)
 +        ff_mpv_common_init_axp(s);
      if (ARCH_ARM)
          ff_mpv_common_init_arm(s);
      if (ARCH_PPC)
@@@ -365,7 -319,7 +338,7 @@@ static int alloc_picture(MpegEncContex
  {
      return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, shared, 0,
                              s->chroma_x_shift, s->chroma_y_shift, s->out_format,
 -                            s->mb_stride, s->mb_height, s->b8_stride,
 +                            s->mb_stride, s->mb_width, s->mb_height, s->b8_stride,
                              &s->linesize, &s->uvlinesize);
  }
  
@@@ -376,9 -330,6 +349,9 @@@ static int init_duplicate_context(MpegE
      int yc_size = y_size + 2 * c_size;
      int i;
  
 +    if (s->mb_height & 1)
 +        yc_size += 2*s->b8_stride + 2*s->mb_stride;
 +
      s->sc.edge_emu_buffer =
      s->me.scratchpad   =
      s->me.temp         =
      }
      if (s->avctx->codec_tag == AV_RL32("VCR2")) {
          // exchange uv
 -        int16_t (*tmp)[64];
 -        tmp           = s->pblocks[4];
 -        s->pblocks[4] = s->pblocks[5];
 -        s->pblocks[5] = tmp;
 +        FFSWAP(void *, s->pblocks[4], s->pblocks[5]);
      }
  
      if (s->out_format == FMT_H263) {
@@@ -482,7 -436,10 +455,7 @@@ int ff_update_duplicate_context(MpegEnc
      }
      if (dst->avctx->codec_tag == AV_RL32("VCR2")) {
          // exchange uv
 -        int16_t (*tmp)[64];
 -        tmp             = dst->pblocks[4];
 -        dst->pblocks[4] = dst->pblocks[5];
 -        dst->pblocks[5] = tmp;
 +        FFSWAP(void *, dst->pblocks[4], dst->pblocks[5]);
      }
      if (!dst->sc.edge_emu_buffer &&
          (ret = ff_mpeg_framesize_alloc(dst->avctx, &dst->me,
@@@ -502,11 -459,9 +475,11 @@@ int ff_mpeg_update_thread_context(AVCod
      int i, ret;
      MpegEncContext *s = dst->priv_data, *s1 = src->priv_data;
  
 -    if (dst == src || !s1->context_initialized)
 +    if (dst == src)
          return 0;
  
 +    av_assert0(s != s1);
 +
      // FIXME can parameters change on I-frames?
      // in that case dst may need a reinit
      if (!s->context_initialized) {
          s->bitstream_buffer      = NULL;
          s->bitstream_buffer_size = s->allocated_bitstream_buffer_size = 0;
  
 -        ff_mpv_idct_init(s);
 -        if ((err = ff_mpv_common_init(s)) < 0)
 -            return err;
 +        if (s1->context_initialized){
 +//             s->picture_range_start  += MAX_PICTURE_COUNT;
 +//             s->picture_range_end    += MAX_PICTURE_COUNT;
 +            ff_mpv_idct_init(s);
 +            if((err = ff_mpv_common_init(s)) < 0){
 +                memset(s, 0, sizeof(MpegEncContext));
 +                s->avctx = dst;
 +                return err;
 +            }
 +        }
      }
  
      if (s->height != s1->height || s->width != s1->width || s->context_reinit) {
 -        int err;
          s->context_reinit = 0;
          s->height = s1->height;
          s->width  = s1->width;
 -        if ((err = ff_mpv_common_frame_size_change(s)) < 0)
 -            return err;
 +        if ((ret = ff_mpv_common_frame_size_change(s)) < 0)
 +            return ret;
      }
  
      s->avctx->coded_height  = s1->avctx->coded_height;
      s->coded_picture_number = s1->coded_picture_number;
      s->picture_number       = s1->picture_number;
  
 +    av_assert0(!s->picture || s->picture != s1->picture);
 +    if(s->picture)
      for (i = 0; i < MAX_PICTURE_COUNT; i++) {
          ff_mpeg_unref_picture(s->avctx, &s->picture[i]);
          if (s1->picture[i].f->buf[0] &&
  #define UPDATE_PICTURE(pic)\
  do {\
      ff_mpeg_unref_picture(s->avctx, &s->pic);\
 -    if (s1->pic.f->buf[0])\
 +    if (s1->pic.f && s1->pic.f->buf[0])\
          ret = ff_mpeg_ref_picture(s->avctx, &s->pic, &s1->pic);\
      else\
          ret = ff_update_picture_tables(&s->pic, &s1->pic);\
      // Error/bug resilience
      s->next_p_frame_damaged = s1->next_p_frame_damaged;
      s->workaround_bugs      = s1->workaround_bugs;
 +    s->padding_bug_score    = s1->padding_bug_score;
  
      // MPEG4 timing info
      memcpy(&s->last_time_base, &s1->last_time_base,
  
      if (s1->bitstream_buffer) {
          if (s1->bitstream_buffer_size +
 -            FF_INPUT_BUFFER_PADDING_SIZE > s->allocated_bitstream_buffer_size)
 +            FF_INPUT_BUFFER_PADDING_SIZE > s->allocated_bitstream_buffer_size) {
              av_fast_malloc(&s->bitstream_buffer,
                             &s->allocated_bitstream_buffer_size,
                             s1->allocated_bitstream_buffer_size);
 -            s->bitstream_buffer_size = s1->bitstream_buffer_size;
 +            if (!s->bitstream_buffer) {
 +                s->bitstream_buffer_size = 0;
 +                return AVERROR(ENOMEM);
 +            }
 +        }
 +        s->bitstream_buffer_size = s1->bitstream_buffer_size;
          memcpy(s->bitstream_buffer, s1->bitstream_buffer,
                 s1->bitstream_buffer_size);
          memset(s->bitstream_buffer + s->bitstream_buffer_size, 0,
          } else {
              av_log(s->avctx, AV_LOG_ERROR, "Context scratch buffers could not "
                     "be allocated due to unknown size.\n");
 -            return AVERROR_BUG;
          }
  
      // MPEG2/interlacing info
@@@ -675,54 -617,6 +648,18 @@@ void ff_mpv_decode_defaults(MpegEncCont
      ff_mpv_common_defaults(s);
  }
  
- static int init_er(MpegEncContext *s)
- {
-     ERContext *er = &s->er;
-     int mb_array_size = s->mb_height * s->mb_stride;
-     int i;
-     er->avctx       = s->avctx;
-     er->mb_index2xy = s->mb_index2xy;
-     er->mb_num      = s->mb_num;
-     er->mb_width    = s->mb_width;
-     er->mb_height   = s->mb_height;
-     er->mb_stride   = s->mb_stride;
-     er->b8_stride   = s->b8_stride;
-     er->er_temp_buffer     = av_malloc(s->mb_height * s->mb_stride);
-     er->error_status_table = av_mallocz(mb_array_size);
-     if (!er->er_temp_buffer || !er->error_status_table)
-         goto fail;
-     er->mbskip_table  = s->mbskip_table;
-     er->mbintra_table = s->mbintra_table;
-     for (i = 0; i < FF_ARRAY_ELEMS(s->dc_val); i++)
-         er->dc_val[i] = s->dc_val[i];
-     er->decode_mb = mpeg_er_decode_mb;
-     er->opaque    = s;
-     return 0;
- fail:
-     av_freep(&er->er_temp_buffer);
-     av_freep(&er->error_status_table);
-     return AVERROR(ENOMEM);
- }
 +void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx)
 +{
 +    s->avctx           = avctx;
 +    s->width           = avctx->coded_width;
 +    s->height          = avctx->coded_height;
 +    s->codec_id        = avctx->codec->id;
 +    s->workaround_bugs = avctx->workaround_bugs;
 +
 +    /* convert fourcc to upper case */
 +    s->codec_tag          = avpriv_toupper4(avctx->codec_tag);
 +}
 +
  /**
   * Initialize and allocates MpegEncContext fields dependent on the resolution.
   */
@@@ -736,7 -630,7 +673,7 @@@ static int init_context_frame(MpegEncCo
      mb_array_size = s->mb_height * s->mb_stride;
      mv_table_size = (s->mb_height + 2) * s->mb_stride + 1;
  
 -    /* set default edge pos, will be overriden
 +    /* set default edge pos, will be overridden
       * in decode_header if needed */
      s->h_edge_pos = s->mb_width * 16;
      s->v_edge_pos = s->mb_height * 16;
      c_size  = s->mb_stride * (s->mb_height + 1);
      yc_size = y_size + 2   * c_size;
  
 -    FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_index2xy, (s->mb_num + 1) * sizeof(int),
 -                      fail); // error ressilience code looks cleaner with this
 +    if (s->mb_height & 1)
 +        yc_size += 2*s->b8_stride + 2*s->mb_stride;
 +
 +    FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_index2xy, (s->mb_num + 1) * sizeof(int), fail); // error ressilience code looks cleaner with this
      for (y = 0; y < s->mb_height; y++)
          for (x = 0; x < s->mb_width; x++)
              s->mb_index2xy[x + y * s->mb_width] = x + y * s->mb_stride;
  
 -    s->mb_index2xy[s->mb_height * s->mb_width] =
 -        (s->mb_height - 1) * s->mb_stride + s->mb_width; // FIXME really needed?
 +    s->mb_index2xy[s->mb_height * s->mb_width] = (s->mb_height - 1) * s->mb_stride + s->mb_width; // FIXME really needed?
  
      if (s->encoding) {
          /* Allocate MV tables */
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->p_mv_table_base,
 -                          mv_table_size * 2 * sizeof(int16_t), fail);
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_forw_mv_table_base,
 -                          mv_table_size * 2 * sizeof(int16_t), fail);
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_back_mv_table_base,
 -                          mv_table_size * 2 * sizeof(int16_t), fail);
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_bidir_forw_mv_table_base,
 -                          mv_table_size * 2 * sizeof(int16_t), fail);
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_bidir_back_mv_table_base,
 -                          mv_table_size * 2 * sizeof(int16_t), fail);
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_direct_mv_table_base,
 -                          mv_table_size * 2 * sizeof(int16_t), fail);
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->p_mv_table_base,                 mv_table_size * 2 * sizeof(int16_t), fail)
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_forw_mv_table_base,            mv_table_size * 2 * sizeof(int16_t), fail)
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_back_mv_table_base,            mv_table_size * 2 * sizeof(int16_t), fail)
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_bidir_forw_mv_table_base,      mv_table_size * 2 * sizeof(int16_t), fail)
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_bidir_back_mv_table_base,      mv_table_size * 2 * sizeof(int16_t), fail)
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->b_direct_mv_table_base,          mv_table_size * 2 * sizeof(int16_t), fail)
          s->p_mv_table            = s->p_mv_table_base + s->mb_stride + 1;
          s->b_forw_mv_table       = s->b_forw_mv_table_base + s->mb_stride + 1;
          s->b_back_mv_table       = s->b_back_mv_table_base + s->mb_stride + 1;
 -        s->b_bidir_forw_mv_table = s->b_bidir_forw_mv_table_base +
 -                                   s->mb_stride + 1;
 -        s->b_bidir_back_mv_table = s->b_bidir_back_mv_table_base +
 -                                   s->mb_stride + 1;
 +        s->b_bidir_forw_mv_table = s->b_bidir_forw_mv_table_base + s->mb_stride + 1;
 +        s->b_bidir_back_mv_table = s->b_bidir_back_mv_table_base + s->mb_stride + 1;
          s->b_direct_mv_table     = s->b_direct_mv_table_base + s->mb_stride + 1;
  
          /* Allocate MB type table */
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_type, mb_array_size *
 -                          sizeof(uint16_t), fail); // needed for encoding
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_type, mb_array_size * sizeof(uint16_t), fail) // needed for encoding
  
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->lambda_table, mb_array_size *
 -                          sizeof(int), fail);
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->lambda_table, mb_array_size * sizeof(int), fail)
  
          FF_ALLOC_OR_GOTO(s->avctx, s->cplx_tab,
                           mb_array_size * sizeof(float), fail);
                      s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] +
                                                     s->mb_stride + 1;
                  }
 -                FF_ALLOCZ_OR_GOTO(s->avctx, s->b_field_select_table [i][j],
 -                                  mb_array_size * 2 * sizeof(uint8_t), fail);
 -                FF_ALLOCZ_OR_GOTO(s->avctx, s->p_field_mv_table_base[i][j],
 -                                  mv_table_size * 2 * sizeof(int16_t), fail);
 -                s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j]
 -                                            + s->mb_stride + 1;
 +                FF_ALLOCZ_OR_GOTO(s->avctx, s->b_field_select_table [i][j], mb_array_size * 2 * sizeof(uint8_t), fail)
 +                FF_ALLOCZ_OR_GOTO(s->avctx, s->p_field_mv_table_base[i][j], mv_table_size * 2 * sizeof(int16_t), fail)
 +                s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1;
              }
 -            FF_ALLOCZ_OR_GOTO(s->avctx, s->p_field_select_table[i],
 -                              mb_array_size * 2 * sizeof(uint8_t), fail);
 +            FF_ALLOCZ_OR_GOTO(s->avctx, s->p_field_select_table[i], mb_array_size * 2 * sizeof(uint8_t), fail)
          }
      }
      if (s->out_format == FMT_H263) {
          /* cbp values */
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->coded_block_base, y_size, fail);
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->coded_block_base, y_size + (s->mb_height&1)*2*s->b8_stride, fail);
          s->coded_block = s->coded_block_base + s->b8_stride + 1;
  
          /* cbp, ac_pred, pred_dir */
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->cbp_table,
 -                          mb_array_size * sizeof(uint8_t), fail);
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->pred_dir_table,
 -                          mb_array_size * sizeof(uint8_t), fail);
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->cbp_table     , mb_array_size * sizeof(uint8_t), fail);
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->pred_dir_table, mb_array_size * sizeof(uint8_t), fail);
      }
  
      if (s->h263_pred || s->h263_plus || !s->encoding) {
          /* dc values */
          // MN: we need these for  error resilience of intra-frames
 -        FF_ALLOCZ_OR_GOTO(s->avctx, s->dc_val_base,
 -                          yc_size * sizeof(int16_t), fail);
 +        FF_ALLOCZ_OR_GOTO(s->avctx, s->dc_val_base, yc_size * sizeof(int16_t), fail);
          s->dc_val[0] = s->dc_val_base + s->b8_stride + 1;
          s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1;
          s->dc_val[2] = s->dc_val[1] + c_size;
      FF_ALLOCZ_OR_GOTO(s->avctx, s->mbskip_table, mb_array_size + 2, fail);
      // Note the + 1 is for  a quicker mpeg4 slice_end detection
  
-     return init_er(s);
+     return ff_mpeg_er_init(s);
  fail:
      return AVERROR(ENOMEM);
  }
@@@ -889,10 -799,12 +826,10 @@@ av_cold int ff_mpv_common_init(MpegEncC
      dct_init(s);
  
      /* set chroma shifts */
 -    av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
 -                                     &s->chroma_x_shift,
 -                                     &s->chroma_y_shift);
 +    avcodec_get_chroma_sub_sample(s->avctx->pix_fmt,
 +                                  &s->chroma_x_shift,
 +                                  &s->chroma_y_shift);
  
 -    /* convert fourcc to upper case */
 -    s->codec_tag          = avpriv_toupper4(s->avctx->codec_tag);
  
      FF_ALLOCZ_OR_GOTO(s->avctx, s->picture,
                        MAX_PICTURE_COUNT * sizeof(Picture), fail);
      if (!s->new_picture.f)
          goto fail;
  
 -    if (s->width && s->height) {
          if (init_context_frame(s))
              goto fail;
  
          s->parse_context.state = -1;
 -    }
  
 -    s->context_initialized = 1;
 -    s->thread_context[0]   = s;
 +        s->context_initialized = 1;
 +        memset(s->thread_context, 0, sizeof(s->thread_context));
 +        s->thread_context[0]   = s;
  
 -    if (s->width && s->height) {
 +//     if (s->width && s->height) {
          if (nb_slices > 1) {
 -            for (i = 1; i < nb_slices; i++) {
 -                s->thread_context[i] = av_malloc(sizeof(MpegEncContext));
 -                memcpy(s->thread_context[i], s, sizeof(MpegEncContext));
 -            }
 -
              for (i = 0; i < nb_slices; i++) {
 +                if (i) {
 +                    s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext));
 +                    if (!s->thread_context[i])
 +                        goto fail;
 +                }
                  if (init_duplicate_context(s->thread_context[i]) < 0)
                      goto fail;
                      s->thread_context[i]->start_mb_y =
              s->end_mb_y   = s->mb_height;
          }
          s->slice_context_count = nb_slices;
 -    }
 +//     }
  
      return 0;
   fail:
@@@ -1004,7 -917,6 +941,7 @@@ static void free_context_frame(MpegEncC
      av_freep(&s->er.er_temp_buffer);
      av_freep(&s->mb_index2xy);
      av_freep(&s->lambda_table);
 +
      av_freep(&s->cplx_tab);
      av_freep(&s->bits_tab);
  
@@@ -1015,9 -927,6 +952,9 @@@ int ff_mpv_common_frame_size_change(Mpe
  {
      int i, err = 0;
  
 +    if (!s->context_initialized)
 +        return AVERROR(EINVAL);
 +
      if (s->slice_context_count > 1) {
          for (i = 0; i < s->slice_context_count; i++) {
              free_duplicate_context(s->thread_context[i]);
      if ((err = init_context_frame(s)))
          goto fail;
  
 +    memset(s->thread_context, 0, sizeof(s->thread_context));
      s->thread_context[0]   = s;
  
      if (s->width && s->height) {
          int nb_slices = s->slice_context_count;
          if (nb_slices > 1) {
 -            for (i = 1; i < nb_slices; i++) {
 -                s->thread_context[i] = av_malloc(sizeof(MpegEncContext));
 -                memcpy(s->thread_context[i], s, sizeof(MpegEncContext));
 -            }
 -
              for (i = 0; i < nb_slices; i++) {
 +                if (i) {
 +                    s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext));
 +                    if (!s->thread_context[i]) {
 +                        err = AVERROR(ENOMEM);
 +                        goto fail;
 +                    }
 +                }
                  if ((err = init_duplicate_context(s->thread_context[i])) < 0)
                      goto fail;
                      s->thread_context[i]->start_mb_y =
                          (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
              }
          } else {
 -            if (init_duplicate_context(s) < 0)
 +            err = init_duplicate_context(s);
 +            if (err < 0)
                  goto fail;
              s->start_mb_y = 0;
              s->end_mb_y   = s->mb_height;
@@@ -1140,23 -1045,6 +1077,23 @@@ void ff_mpv_common_end(MpegEncContext *
      s->linesize = s->uvlinesize = 0;
  }
  
 +
 +static void gray_frame(AVFrame *frame)
 +{
 +    int i, h_chroma_shift, v_chroma_shift;
 +
 +    av_pix_fmt_get_chroma_sub_sample(frame->format, &h_chroma_shift, &v_chroma_shift);
 +
 +    for(i=0; i<frame->height; i++)
 +        memset(frame->data[0] + frame->linesize[0]*i, 0x80, frame->width);
 +    for(i=0; i<FF_CEIL_RSHIFT(frame->height, v_chroma_shift); i++) {
 +        memset(frame->data[1] + frame->linesize[1]*i,
 +               0x80, FF_CEIL_RSHIFT(frame->width, h_chroma_shift));
 +        memset(frame->data[2] + frame->linesize[2]*i,
 +               0x80, FF_CEIL_RSHIFT(frame->width, h_chroma_shift));
 +    }
 +}
 +
  /**
   * generic function called after decoding
   * the header and before a frame is decoded.
@@@ -1167,11 -1055,6 +1104,11 @@@ int ff_mpv_frame_start(MpegEncContext *
      Picture *pic;
      s->mb_skipped = 0;
  
 +    if (!ff_thread_can_start_frame(avctx)) {
 +        av_log(avctx, AV_LOG_ERROR, "Attempt to start a frame outside SETUP state\n");
 +        return -1;
 +    }
 +
      /* mark & release old frames */
      if (s->pict_type != AV_PICTURE_TYPE_B && s->last_picture_ptr &&
          s->last_picture_ptr != s->next_picture_ptr &&
          int h_chroma_shift, v_chroma_shift;
          av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
                                           &h_chroma_shift, &v_chroma_shift);
 -        if (s->pict_type != AV_PICTURE_TYPE_I)
 +        if (s->pict_type == AV_PICTURE_TYPE_B && s->next_picture_ptr && s->next_picture_ptr->f->buf[0])
 +            av_log(avctx, AV_LOG_DEBUG,
 +                   "allocating dummy last picture for B frame\n");
 +        else if (s->pict_type != AV_PICTURE_TYPE_I)
              av_log(avctx, AV_LOG_ERROR,
                     "warning: first frame is no keyframe\n");
          else if (s->picture_structure != PICT_FRAME)
 -            av_log(avctx, AV_LOG_INFO,
 +            av_log(avctx, AV_LOG_DEBUG,
                     "allocate dummy last picture for field based first keyframe\n");
  
          /* Allocate a dummy frame */
          s->last_picture_ptr = &s->picture[i];
  
          s->last_picture_ptr->reference   = 3;
 -        s->last_picture_ptr->f->pict_type = AV_PICTURE_TYPE_I;
 +        s->last_picture_ptr->f->key_frame = 0;
 +        s->last_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P;
  
          if (alloc_picture(s, s->last_picture_ptr, 0) < 0) {
              s->last_picture_ptr = NULL;
              return -1;
          }
  
 -        memset(s->last_picture_ptr->f->data[0], 0,
 -               avctx->height * s->last_picture_ptr->f->linesize[0]);
 -        memset(s->last_picture_ptr->f->data[1], 0x80,
 -               (avctx->height >> v_chroma_shift) *
 -               s->last_picture_ptr->f->linesize[1]);
 -        memset(s->last_picture_ptr->f->data[2], 0x80,
 -               (avctx->height >> v_chroma_shift) *
 -               s->last_picture_ptr->f->linesize[2]);
 +        if (!avctx->hwaccel && !(avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)) {
 +            for(i=0; i<avctx->height; i++)
 +                memset(s->last_picture_ptr->f->data[0] + s->last_picture_ptr->f->linesize[0]*i,
 +                       0x80, avctx->width);
 +            if (s->last_picture_ptr->f->data[2]) {
 +                for(i=0; i<FF_CEIL_RSHIFT(avctx->height, v_chroma_shift); i++) {
 +                    memset(s->last_picture_ptr->f->data[1] + s->last_picture_ptr->f->linesize[1]*i,
 +                        0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift));
 +                    memset(s->last_picture_ptr->f->data[2] + s->last_picture_ptr->f->linesize[2]*i,
 +                        0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift));
 +                }
 +            }
 +
 +            if(s->codec_id == AV_CODEC_ID_FLV1 || s->codec_id == AV_CODEC_ID_H263){
 +                for(i=0; i<avctx->height; i++)
 +                memset(s->last_picture_ptr->f->data[0] + s->last_picture_ptr->f->linesize[0]*i, 16, avctx->width);
 +            }
 +        }
  
          ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 0);
          ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 1);
          s->next_picture_ptr = &s->picture[i];
  
          s->next_picture_ptr->reference   = 3;
 -        s->next_picture_ptr->f->pict_type = AV_PICTURE_TYPE_I;
 +        s->next_picture_ptr->f->key_frame = 0;
 +        s->next_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P;
  
          if (alloc_picture(s, s->next_picture_ptr, 0) < 0) {
              s->next_picture_ptr = NULL;
          ff_thread_report_progress(&s->next_picture_ptr->tf, INT_MAX, 1);
      }
  
 +#if 0 // BUFREF-FIXME
 +    memset(s->last_picture.f->data, 0, sizeof(s->last_picture.f->data));
 +    memset(s->next_picture.f->data, 0, sizeof(s->next_picture.f->data));
 +#endif
      if (s->last_picture_ptr) {
          ff_mpeg_unref_picture(s->avctx, &s->last_picture);
          if (s->last_picture_ptr->f->buf[0] &&
              return ret;
      }
  
 -    if (s->pict_type != AV_PICTURE_TYPE_I &&
 -        !(s->last_picture_ptr && s->last_picture_ptr->f->buf[0])) {
 -        av_log(s, AV_LOG_ERROR,
 -               "Non-reference picture received and no reference available\n");
 -        return AVERROR_INVALIDDATA;
 -    }
 +    av_assert0(s->pict_type == AV_PICTURE_TYPE_I || (s->last_picture_ptr &&
 +                                                 s->last_picture_ptr->f->buf[0]));
  
      if (s->picture_structure!= PICT_FRAME) {
          int i;
          s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter;
      }
  
 -#if FF_API_XVMC
 -FF_DISABLE_DEPRECATION_WARNINGS
 -    if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
 -        return ff_xvmc_field_start(s, avctx);
 -FF_ENABLE_DEPRECATION_WARNINGS
 -#endif /* FF_API_XVMC */
 +    if (s->avctx->debug & FF_DEBUG_NOMC) {
 +        gray_frame(s->current_picture_ptr->f);
 +    }
  
      return 0;
  }
  /* called after a frame has been decoded. */
  void ff_mpv_frame_end(MpegEncContext *s)
  {
 -#if FF_API_XVMC
 -FF_DISABLE_DEPRECATION_WARNINGS
 -    /* redraw edges for the frame if decoding didn't complete */
 -    // just to make sure that all data is rendered.
 -    if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) {
 -        ff_xvmc_field_end(s);
 -    } else
 -FF_ENABLE_DEPRECATION_WARNINGS
 -#endif /* FF_API_XVMC */
 -
      emms_c();
  
      if (s->current_picture.reference)
          ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
  }
  
 +
 +#if FF_API_VISMV
 +static int clip_line(int *sx, int *sy, int *ex, int *ey, int maxx)
 +{
 +    if(*sx > *ex)
 +        return clip_line(ex, ey, sx, sy, maxx);
 +
 +    if (*sx < 0) {
 +        if (*ex < 0)
 +            return 1;
 +        *sy = *ey + (*sy - *ey) * (int64_t)*ex / (*ex - *sx);
 +        *sx = 0;
 +    }
 +
 +    if (*ex > maxx) {
 +        if (*sx > maxx)
 +            return 1;
 +        *ey = *sy + (*ey - *sy) * (int64_t)(maxx - *sx) / (*ex - *sx);
 +        *ex = maxx;
 +    }
 +    return 0;
 +}
 +
 +
 +/**
 + * Draw a line from (ex, ey) -> (sx, sy).
 + * @param w width of the image
 + * @param h height of the image
 + * @param stride stride/linesize of the image
 + * @param color color of the arrow
 + */
 +static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey,
 +                      int w, int h, int stride, int color)
 +{
 +    int x, y, fr, f;
 +
 +    if (clip_line(&sx, &sy, &ex, &ey, w - 1))
 +        return;
 +    if (clip_line(&sy, &sx, &ey, &ex, h - 1))
 +        return;
 +
 +    sx = av_clip(sx, 0, w - 1);
 +    sy = av_clip(sy, 0, h - 1);
 +    ex = av_clip(ex, 0, w - 1);
 +    ey = av_clip(ey, 0, h - 1);
 +
 +    buf[sy * stride + sx] += color;
 +
 +    if (FFABS(ex - sx) > FFABS(ey - sy)) {
 +        if (sx > ex) {
 +            FFSWAP(int, sx, ex);
 +            FFSWAP(int, sy, ey);
 +        }
 +        buf += sx + sy * stride;
 +        ex  -= sx;
 +        f    = ((ey - sy) << 16) / ex;
 +        for (x = 0; x <= ex; x++) {
 +            y  = (x * f) >> 16;
 +            fr = (x * f) & 0xFFFF;
 +            buf[y * stride + x]       += (color * (0x10000 - fr)) >> 16;
 +            if(fr) buf[(y + 1) * stride + x] += (color *            fr ) >> 16;
 +        }
 +    } else {
 +        if (sy > ey) {
 +            FFSWAP(int, sx, ex);
 +            FFSWAP(int, sy, ey);
 +        }
 +        buf += sx + sy * stride;
 +        ey  -= sy;
 +        if (ey)
 +            f = ((ex - sx) << 16) / ey;
 +        else
 +            f = 0;
 +        for(y= 0; y <= ey; y++){
 +            x  = (y*f) >> 16;
 +            fr = (y*f) & 0xFFFF;
 +            buf[y * stride + x]     += (color * (0x10000 - fr)) >> 16;
 +            if(fr) buf[y * stride + x + 1] += (color *            fr ) >> 16;
 +        }
 +    }
 +}
 +
 +/**
 + * Draw an arrow from (ex, ey) -> (sx, sy).
 + * @param w width of the image
 + * @param h height of the image
 + * @param stride stride/linesize of the image
 + * @param color color of the arrow
 + */
 +static void draw_arrow(uint8_t *buf, int sx, int sy, int ex,
 +                       int ey, int w, int h, int stride, int color, int tail, int direction)
 +{
 +    int dx,dy;
 +
 +    if (direction) {
 +        FFSWAP(int, sx, ex);
 +        FFSWAP(int, sy, ey);
 +    }
 +
 +    sx = av_clip(sx, -100, w + 100);
 +    sy = av_clip(sy, -100, h + 100);
 +    ex = av_clip(ex, -100, w + 100);
 +    ey = av_clip(ey, -100, h + 100);
 +
 +    dx = ex - sx;
 +    dy = ey - sy;
 +
 +    if (dx * dx + dy * dy > 3 * 3) {
 +        int rx =  dx + dy;
 +        int ry = -dx + dy;
 +        int length = ff_sqrt((rx * rx + ry * ry) << 8);
 +
 +        // FIXME subpixel accuracy
 +        rx = ROUNDED_DIV(rx * 3 << 4, length);
 +        ry = ROUNDED_DIV(ry * 3 << 4, length);
 +
 +        if (tail) {
 +            rx = -rx;
 +            ry = -ry;
 +        }
 +
 +        draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color);
 +        draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color);
 +    }
 +    draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
 +}
 +#endif
 +
 +static int add_mb(AVMotionVector *mb, uint32_t mb_type,
 +                  int dst_x, int dst_y,
 +                  int src_x, int src_y,
 +                  int direction)
 +{
 +    mb->w = IS_8X8(mb_type) || IS_8X16(mb_type) ? 8 : 16;
 +    mb->h = IS_8X8(mb_type) || IS_16X8(mb_type) ? 8 : 16;
 +    mb->src_x = src_x;
 +    mb->src_y = src_y;
 +    mb->dst_x = dst_x;
 +    mb->dst_y = dst_y;
 +    mb->source = direction ? 1 : -1;
 +    mb->flags = 0; // XXX: does mb_type contain extra information that could be exported here?
 +    return 1;
 +}
 +
  /**
   * Print debugging info for the given picture.
   */
 -void ff_print_debug_info(MpegEncContext *s, Picture *p)
 +void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table,
 +                         uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2],
 +                         int *low_delay,
 +                         int mb_width, int mb_height, int mb_stride, int quarter_sample)
  {
 -    AVFrame *pict;
 -    if (s->avctx->hwaccel || !p || !p->mb_type)
 +    if ((avctx->flags2 & CODEC_FLAG2_EXPORT_MVS) && mbtype_table && motion_val[0]) {
 +        const int shift = 1 + quarter_sample;
 +        const int mv_sample_log2 = avctx->codec_id == AV_CODEC_ID_H264 || avctx->codec_id == AV_CODEC_ID_SVQ3 ? 2 : 1;
 +        const int mv_stride      = (mb_width << mv_sample_log2) +
 +                                   (avctx->codec->id == AV_CODEC_ID_H264 ? 0 : 1);
 +        int mb_x, mb_y, mbcount = 0;
 +
 +        /* size is width * height * 2 * 4 where 2 is for directions and 4 is
 +         * for the maximum number of MB (4 MB in case of IS_8x8) */
 +        AVMotionVector *mvs = av_malloc_array(mb_width * mb_height, 2 * 4 * sizeof(AVMotionVector));
 +        if (!mvs)
 +            return;
 +
 +        for (mb_y = 0; mb_y < mb_height; mb_y++) {
 +            for (mb_x = 0; mb_x < mb_width; mb_x++) {
 +                int i, direction, mb_type = mbtype_table[mb_x + mb_y * mb_stride];
 +                for (direction = 0; direction < 2; direction++) {
 +                    if (!USES_LIST(mb_type, direction))
 +                        continue;
 +                    if (IS_8X8(mb_type)) {
 +                        for (i = 0; i < 4; i++) {
 +                            int sx = mb_x * 16 + 4 + 8 * (i & 1);
 +                            int sy = mb_y * 16 + 4 + 8 * (i >> 1);
 +                            int xy = (mb_x * 2 + (i & 1) +
 +                                      (mb_y * 2 + (i >> 1)) * mv_stride) << (mv_sample_log2 - 1);
 +                            int mx = (motion_val[direction][xy][0] >> shift) + sx;
 +                            int my = (motion_val[direction][xy][1] >> shift) + sy;
 +                            mbcount += add_mb(mvs + mbcount, mb_type, sx, sy, mx, my, direction);
 +                        }
 +                    } else if (IS_16X8(mb_type)) {
 +                        for (i = 0; i < 2; i++) {
 +                            int sx = mb_x * 16 + 8;
 +                            int sy = mb_y * 16 + 4 + 8 * i;
 +                            int xy = (mb_x * 2 + (mb_y * 2 + i) * mv_stride) << (mv_sample_log2 - 1);
 +                            int mx = (motion_val[direction][xy][0] >> shift);
 +                            int my = (motion_val[direction][xy][1] >> shift);
 +
 +                            if (IS_INTERLACED(mb_type))
 +                                my *= 2;
 +
 +                            mbcount += add_mb(mvs + mbcount, mb_type, sx, sy, mx + sx, my + sy, direction);
 +                        }
 +                    } else if (IS_8X16(mb_type)) {
 +                        for (i = 0; i < 2; i++) {
 +                            int sx = mb_x * 16 + 4 + 8 * i;
 +                            int sy = mb_y * 16 + 8;
 +                            int xy = (mb_x * 2 + i + mb_y * 2 * mv_stride) << (mv_sample_log2 - 1);
 +                            int mx = motion_val[direction][xy][0] >> shift;
 +                            int my = motion_val[direction][xy][1] >> shift;
 +
 +                            if (IS_INTERLACED(mb_type))
 +                                my *= 2;
 +
 +                            mbcount += add_mb(mvs + mbcount, mb_type, sx, sy, mx + sx, my + sy, direction);
 +                        }
 +                    } else {
 +                          int sx = mb_x * 16 + 8;
 +                          int sy = mb_y * 16 + 8;
 +                          int xy = (mb_x + mb_y * mv_stride) << mv_sample_log2;
 +                          int mx = (motion_val[direction][xy][0]>>shift) + sx;
 +                          int my = (motion_val[direction][xy][1]>>shift) + sy;
 +                          mbcount += add_mb(mvs + mbcount, mb_type, sx, sy, mx, my, direction);
 +                    }
 +                }
 +            }
 +        }
 +
 +        if (mbcount) {
 +            AVFrameSideData *sd;
 +
 +            av_log(avctx, AV_LOG_DEBUG, "Adding %d MVs info to frame %d\n", mbcount, avctx->frame_number);
 +            sd = av_frame_new_side_data(pict, AV_FRAME_DATA_MOTION_VECTORS, mbcount * sizeof(AVMotionVector));
 +            if (!sd) {
 +                av_freep(&mvs);
 +                return;
 +            }
 +            memcpy(sd->data, mvs, mbcount * sizeof(AVMotionVector));
 +        }
 +
 +        av_freep(&mvs);
 +    }
 +
 +    /* TODO: export all the following to make them accessible for users (and filters) */
 +    if (avctx->hwaccel || !mbtype_table
 +        || (avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU))
          return;
 -    pict = p->f;
  
 -    if (s->avctx->debug & (FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE)) {
 +
 +    if (avctx->debug & (FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE)) {
          int x,y;
  
 -        av_log(s->avctx,AV_LOG_DEBUG,"New frame, type: ");
 -        switch (pict->pict_type) {
 -        case AV_PICTURE_TYPE_I:
 -            av_log(s->avctx,AV_LOG_DEBUG,"I\n");
 -            break;
 -        case AV_PICTURE_TYPE_P:
 -            av_log(s->avctx,AV_LOG_DEBUG,"P\n");
 -            break;
 -        case AV_PICTURE_TYPE_B:
 -            av_log(s->avctx,AV_LOG_DEBUG,"B\n");
 -            break;
 -        case AV_PICTURE_TYPE_S:
 -            av_log(s->avctx,AV_LOG_DEBUG,"S\n");
 -            break;
 -        case AV_PICTURE_TYPE_SI:
 -            av_log(s->avctx,AV_LOG_DEBUG,"SI\n");
 -            break;
 -        case AV_PICTURE_TYPE_SP:
 -            av_log(s->avctx,AV_LOG_DEBUG,"SP\n");
 -            break;
 -        }
 -        for (y = 0; y < s->mb_height; y++) {
 -            for (x = 0; x < s->mb_width; x++) {
 -                if (s->avctx->debug & FF_DEBUG_SKIP) {
 -                    int count = s->mbskip_table[x + y * s->mb_stride];
 +        av_log(avctx, AV_LOG_DEBUG, "New frame, type: %c\n",
 +               av_get_picture_type_char(pict->pict_type));
 +        for (y = 0; y < mb_height; y++) {
 +            for (x = 0; x < mb_width; x++) {
 +                if (avctx->debug & FF_DEBUG_SKIP) {
 +                    int count = mbskip_table ? mbskip_table[x + y * mb_stride] : 0;
                      if (count > 9)
                          count = 9;
 -                    av_log(s->avctx, AV_LOG_DEBUG, "%1d", count);
 +                    av_log(avctx, AV_LOG_DEBUG, "%1d", count);
                  }
 -                if (s->avctx->debug & FF_DEBUG_QP) {
 -                    av_log(s->avctx, AV_LOG_DEBUG, "%2d",
 -                           p->qscale_table[x + y * s->mb_stride]);
 +                if (avctx->debug & FF_DEBUG_QP) {
 +                    av_log(avctx, AV_LOG_DEBUG, "%2d",
 +                           qscale_table[x + y * mb_stride]);
                  }
 -                if (s->avctx->debug & FF_DEBUG_MB_TYPE) {
 -                    int mb_type = p->mb_type[x + y * s->mb_stride];
 +                if (avctx->debug & FF_DEBUG_MB_TYPE) {
 +                    int mb_type = mbtype_table[x + y * mb_stride];
                      // Type & MV direction
                      if (IS_PCM(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "P");
 +                        av_log(avctx, AV_LOG_DEBUG, "P");
                      else if (IS_INTRA(mb_type) && IS_ACPRED(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "A");
 +                        av_log(avctx, AV_LOG_DEBUG, "A");
                      else if (IS_INTRA4x4(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "i");
 +                        av_log(avctx, AV_LOG_DEBUG, "i");
                      else if (IS_INTRA16x16(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "I");
 +                        av_log(avctx, AV_LOG_DEBUG, "I");
                      else if (IS_DIRECT(mb_type) && IS_SKIP(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "d");
 +                        av_log(avctx, AV_LOG_DEBUG, "d");
                      else if (IS_DIRECT(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "D");
 +                        av_log(avctx, AV_LOG_DEBUG, "D");
                      else if (IS_GMC(mb_type) && IS_SKIP(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "g");
 +                        av_log(avctx, AV_LOG_DEBUG, "g");
                      else if (IS_GMC(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "G");
 +                        av_log(avctx, AV_LOG_DEBUG, "G");
                      else if (IS_SKIP(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "S");
 +                        av_log(avctx, AV_LOG_DEBUG, "S");
                      else if (!USES_LIST(mb_type, 1))
 -                        av_log(s->avctx, AV_LOG_DEBUG, ">");
 +                        av_log(avctx, AV_LOG_DEBUG, ">");
                      else if (!USES_LIST(mb_type, 0))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "<");
 +                        av_log(avctx, AV_LOG_DEBUG, "<");
                      else {
 -                        assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1));
 -                        av_log(s->avctx, AV_LOG_DEBUG, "X");
 +                        av_assert2(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1));
 +                        av_log(avctx, AV_LOG_DEBUG, "X");
                      }
  
                      // segmentation
                      if (IS_8X8(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "+");
 +                        av_log(avctx, AV_LOG_DEBUG, "+");
                      else if (IS_16X8(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "-");
 +                        av_log(avctx, AV_LOG_DEBUG, "-");
                      else if (IS_8X16(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "|");
 +                        av_log(avctx, AV_LOG_DEBUG, "|");
                      else if (IS_INTRA(mb_type) || IS_16X16(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, " ");
 +                        av_log(avctx, AV_LOG_DEBUG, " ");
                      else
 -                        av_log(s->avctx, AV_LOG_DEBUG, "?");
 +                        av_log(avctx, AV_LOG_DEBUG, "?");
  
  
                      if (IS_INTERLACED(mb_type))
 -                        av_log(s->avctx, AV_LOG_DEBUG, "=");
 +                        av_log(avctx, AV_LOG_DEBUG, "=");
                      else
 -                        av_log(s->avctx, AV_LOG_DEBUG, " ");
 +                        av_log(avctx, AV_LOG_DEBUG, " ");
 +                }
 +            }
 +            av_log(avctx, AV_LOG_DEBUG, "\n");
 +        }
 +    }
 +
 +    if ((avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) ||
 +        (avctx->debug_mv)) {
 +        int mb_y;
 +        int i;
 +        int h_chroma_shift, v_chroma_shift, block_height;
 +#if FF_API_VISMV
 +        const int shift = 1 + quarter_sample;
 +        uint8_t *ptr;
 +        const int width          = avctx->width;
 +        const int height         = avctx->height;
 +#endif
 +        const int mv_sample_log2 = avctx->codec_id == AV_CODEC_ID_H264 || avctx->codec_id == AV_CODEC_ID_SVQ3 ? 2 : 1;
 +        const int mv_stride      = (mb_width << mv_sample_log2) +
 +                                   (avctx->codec->id == AV_CODEC_ID_H264 ? 0 : 1);
 +
 +        *low_delay = 0; // needed to see the vectors without trashing the buffers
 +
 +        avcodec_get_chroma_sub_sample(avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift);
 +
 +        av_frame_make_writable(pict);
 +
 +        pict->opaque = NULL;
 +#if FF_API_VISMV
 +        ptr          = pict->data[0];
 +#endif
 +        block_height = 16 >> v_chroma_shift;
 +
 +        for (mb_y = 0; mb_y < mb_height; mb_y++) {
 +            int mb_x;
 +            for (mb_x = 0; mb_x < mb_width; mb_x++) {
 +                const int mb_index = mb_x + mb_y * mb_stride;
 +#if FF_API_VISMV
 +                if ((avctx->debug_mv) && motion_val[0]) {
 +                    int type;
 +                    for (type = 0; type < 3; type++) {
 +                        int direction = 0;
 +                        switch (type) {
 +                        case 0:
 +                            if ((!(avctx->debug_mv & FF_DEBUG_VIS_MV_P_FOR)) ||
 +                                (pict->pict_type!= AV_PICTURE_TYPE_P))
 +                                continue;
 +                            direction = 0;
 +                            break;
 +                        case 1:
 +                            if ((!(avctx->debug_mv & FF_DEBUG_VIS_MV_B_FOR)) ||
 +                                (pict->pict_type!= AV_PICTURE_TYPE_B))
 +                                continue;
 +                            direction = 0;
 +                            break;
 +                        case 2:
 +                            if ((!(avctx->debug_mv & FF_DEBUG_VIS_MV_B_BACK)) ||
 +                                (pict->pict_type!= AV_PICTURE_TYPE_B))
 +                                continue;
 +                            direction = 1;
 +                            break;
 +                        }
 +                        if (!USES_LIST(mbtype_table[mb_index], direction))
 +                            continue;
 +
 +                        if (IS_8X8(mbtype_table[mb_index])) {
 +                            int i;
 +                            for (i = 0; i < 4; i++) {
 +                                int sx = mb_x * 16 + 4 + 8 * (i & 1);
 +                                int sy = mb_y * 16 + 4 + 8 * (i >> 1);
 +                                int xy = (mb_x * 2 + (i & 1) +
 +                                          (mb_y * 2 + (i >> 1)) * mv_stride) << (mv_sample_log2 - 1);
 +                                int mx = (motion_val[direction][xy][0] >> shift) + sx;
 +                                int my = (motion_val[direction][xy][1] >> shift) + sy;
 +                                draw_arrow(ptr, sx, sy, mx, my, width,
 +                                           height, pict->linesize[0], 100, 0, direction);
 +                            }
 +                        } else if (IS_16X8(mbtype_table[mb_index])) {
 +                            int i;
 +                            for (i = 0; i < 2; i++) {
 +                                int sx = mb_x * 16 + 8;
 +                                int sy = mb_y * 16 + 4 + 8 * i;
 +                                int xy = (mb_x * 2 + (mb_y * 2 + i) * mv_stride) << (mv_sample_log2 - 1);
 +                                int mx = (motion_val[direction][xy][0] >> shift);
 +                                int my = (motion_val[direction][xy][1] >> shift);
 +
 +                                if (IS_INTERLACED(mbtype_table[mb_index]))
 +                                    my *= 2;
 +
 +                                draw_arrow(ptr, sx, sy, mx + sx, my + sy, width,
 +                                           height, pict->linesize[0], 100, 0, direction);
 +                            }
 +                        } else if (IS_8X16(mbtype_table[mb_index])) {
 +                            int i;
 +                            for (i = 0; i < 2; i++) {
 +                                int sx = mb_x * 16 + 4 + 8 * i;
 +                                int sy = mb_y * 16 + 8;
 +                                int xy = (mb_x * 2 + i + mb_y * 2 * mv_stride) << (mv_sample_log2 - 1);
 +                                int mx = motion_val[direction][xy][0] >> shift;
 +                                int my = motion_val[direction][xy][1] >> shift;
 +
 +                                if (IS_INTERLACED(mbtype_table[mb_index]))
 +                                    my *= 2;
 +
 +                                draw_arrow(ptr, sx, sy, mx + sx, my + sy, width,
 +                                           height, pict->linesize[0], 100, 0, direction);
 +                            }
 +                        } else {
 +                              int sx= mb_x * 16 + 8;
 +                              int sy= mb_y * 16 + 8;
 +                              int xy= (mb_x + mb_y * mv_stride) << mv_sample_log2;
 +                              int mx= (motion_val[direction][xy][0]>>shift) + sx;
 +                              int my= (motion_val[direction][xy][1]>>shift) + sy;
 +                              draw_arrow(ptr, sx, sy, mx, my, width, height, pict->linesize[0], 100, 0, direction);
 +                        }
 +                    }
 +                }
 +#endif
 +                if ((avctx->debug & FF_DEBUG_VIS_QP)) {
 +                    uint64_t c = (qscale_table[mb_index] * 128 / 31) *
 +                                 0x0101010101010101ULL;
 +                    int y;
 +                    for (y = 0; y < block_height; y++) {
 +                        *(uint64_t *)(pict->data[1] + 8 * mb_x +
 +                                      (block_height * mb_y + y) *
 +                                      pict->linesize[1]) = c;
 +                        *(uint64_t *)(pict->data[2] + 8 * mb_x +
 +                                      (block_height * mb_y + y) *
 +                                      pict->linesize[2]) = c;
 +                    }
 +                }
 +                if ((avctx->debug & FF_DEBUG_VIS_MB_TYPE) &&
 +                    motion_val[0]) {
 +                    int mb_type = mbtype_table[mb_index];
 +                    uint64_t u,v;
 +                    int y;
 +#define COLOR(theta, r) \
 +    u = (int)(128 + r * cos(theta * 3.141592 / 180)); \
 +    v = (int)(128 + r * sin(theta * 3.141592 / 180));
 +
 +
 +                    u = v = 128;
 +                    if (IS_PCM(mb_type)) {
 +                        COLOR(120, 48)
 +                    } else if ((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) ||
 +                               IS_INTRA16x16(mb_type)) {
 +                        COLOR(30, 48)
 +                    } else if (IS_INTRA4x4(mb_type)) {
 +                        COLOR(90, 48)
 +                    } else if (IS_DIRECT(mb_type) && IS_SKIP(mb_type)) {
 +                        // COLOR(120, 48)
 +                    } else if (IS_DIRECT(mb_type)) {
 +                        COLOR(150, 48)
 +                    } else if (IS_GMC(mb_type) && IS_SKIP(mb_type)) {
 +                        COLOR(170, 48)
 +                    } else if (IS_GMC(mb_type)) {
 +                        COLOR(190, 48)
 +                    } else if (IS_SKIP(mb_type)) {
 +                        // COLOR(180, 48)
 +                    } else if (!USES_LIST(mb_type, 1)) {
 +                        COLOR(240, 48)
 +                    } else if (!USES_LIST(mb_type, 0)) {
 +                        COLOR(0, 48)
 +                    } else {
 +                        av_assert2(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1));
 +                        COLOR(300,48)
 +                    }
 +
 +                    u *= 0x0101010101010101ULL;
 +                    v *= 0x0101010101010101ULL;
 +                    for (y = 0; y < block_height; y++) {
 +                        *(uint64_t *)(pict->data[1] + 8 * mb_x +
 +                                      (block_height * mb_y + y) * pict->linesize[1]) = u;
 +                        *(uint64_t *)(pict->data[2] + 8 * mb_x +
 +                                      (block_height * mb_y + y) * pict->linesize[2]) = v;
 +                    }
 +
 +                    // segmentation
 +                    if (IS_8X8(mb_type) || IS_16X8(mb_type)) {
 +                        *(uint64_t *)(pict->data[0] + 16 * mb_x + 0 +
 +                                      (16 * mb_y + 8) * pict->linesize[0]) ^= 0x8080808080808080ULL;
 +                        *(uint64_t *)(pict->data[0] + 16 * mb_x + 8 +
 +                                      (16 * mb_y + 8) * pict->linesize[0]) ^= 0x8080808080808080ULL;
 +                    }
 +                    if (IS_8X8(mb_type) || IS_8X16(mb_type)) {
 +                        for (y = 0; y < 16; y++)
 +                            pict->data[0][16 * mb_x + 8 + (16 * mb_y + y) *
 +                                          pict->linesize[0]] ^= 0x80;
 +                    }
 +                    if (IS_8X8(mb_type) && mv_sample_log2 >= 2) {
 +                        int dm = 1 << (mv_sample_log2 - 2);
 +                        for (i = 0; i < 4; i++) {
 +                            int sx = mb_x * 16 + 8 * (i & 1);
 +                            int sy = mb_y * 16 + 8 * (i >> 1);
 +                            int xy = (mb_x * 2 + (i & 1) +
 +                                     (mb_y * 2 + (i >> 1)) * mv_stride) << (mv_sample_log2 - 1);
 +                            // FIXME bidir
 +                            int32_t *mv = (int32_t *) &motion_val[0][xy];
 +                            if (mv[0] != mv[dm] ||
 +                                mv[dm * mv_stride] != mv[dm * (mv_stride + 1)])
 +                                for (y = 0; y < 8; y++)
 +                                    pict->data[0][sx + 4 + (sy + y) * pict->linesize[0]] ^= 0x80;
 +                            if (mv[0] != mv[dm * mv_stride] || mv[dm] != mv[dm * (mv_stride + 1)])
 +                                *(uint64_t *)(pict->data[0] + sx + (sy + 4) *
 +                                              pict->linesize[0]) ^= 0x8080808080808080ULL;
 +                        }
 +                    }
 +
 +                    if (IS_INTERLACED(mb_type) &&
 +                        avctx->codec->id == AV_CODEC_ID_H264) {
 +                        // hmm
 +                    }
 +                }
 +                if (mbskip_table)
 +                    mbskip_table[mb_index] = 0;
 +            }
 +        }
 +    }
 +}
 +
 +void ff_print_debug_info(MpegEncContext *s, Picture *p, AVFrame *pict)
 +{
 +    ff_print_debug_info2(s->avctx, pict, s->mbskip_table, p->mb_type,
 +                         p->qscale_table, p->motion_val, &s->low_delay,
 +                         s->mb_width, s->mb_height, s->mb_stride, s->quarter_sample);
 +}
 +
 +int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type)
 +{
 +    AVBufferRef *ref = av_buffer_ref(p->qscale_table_buf);
 +    int offset = 2*s->mb_stride + 1;
 +    if(!ref)
 +        return AVERROR(ENOMEM);
 +    av_assert0(ref->size >= offset + s->mb_stride * ((f->height+15)/16));
 +    ref->size -= offset;
 +    ref->data += offset;
 +    return av_frame_set_qp_table(f, ref, s->mb_stride, qp_type);
 +}
 +
 +static inline int hpel_motion_lowres(MpegEncContext *s,
 +                                     uint8_t *dest, uint8_t *src,
 +                                     int field_based, int field_select,
 +                                     int src_x, int src_y,
 +                                     int width, int height, ptrdiff_t stride,
 +                                     int h_edge_pos, int v_edge_pos,
 +                                     int w, int h, h264_chroma_mc_func *pix_op,
 +                                     int motion_x, int motion_y)
 +{
 +    const int lowres   = s->avctx->lowres;
 +    const int op_index = FFMIN(lowres, 3);
 +    const int s_mask   = (2 << lowres) - 1;
 +    int emu = 0;
 +    int sx, sy;
 +
 +    if (s->quarter_sample) {
 +        motion_x /= 2;
 +        motion_y /= 2;
 +    }
 +
 +    sx = motion_x & s_mask;
 +    sy = motion_y & s_mask;
 +    src_x += motion_x >> lowres + 1;
 +    src_y += motion_y >> lowres + 1;
 +
 +    src   += src_y * stride + src_x;
 +
 +    if ((unsigned)src_x > FFMAX( h_edge_pos - (!!sx) - w,                 0) ||
 +        (unsigned)src_y > FFMAX((v_edge_pos >> field_based) - (!!sy) - h, 0)) {
 +        s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, src,
 +                                 s->linesize, s->linesize,
 +                                 w + 1, (h + 1) << field_based,
 +                                 src_x, src_y   << field_based,
 +                                 h_edge_pos, v_edge_pos);
 +        src = s->sc.edge_emu_buffer;
 +        emu = 1;
 +    }
 +
 +    sx = (sx << 2) >> lowres;
 +    sy = (sy << 2) >> lowres;
 +    if (field_select)
 +        src += s->linesize;
 +    pix_op[op_index](dest, src, stride, h, sx, sy);
 +    return emu;
 +}
 +
 +/* apply one mpeg motion vector to the three components */
 +static av_always_inline void mpeg_motion_lowres(MpegEncContext *s,
 +                                                uint8_t *dest_y,
 +                                                uint8_t *dest_cb,
 +                                                uint8_t *dest_cr,
 +                                                int field_based,
 +                                                int bottom_field,
 +                                                int field_select,
 +                                                uint8_t **ref_picture,
 +                                                h264_chroma_mc_func *pix_op,
 +                                                int motion_x, int motion_y,
 +                                                int h, int mb_y)
 +{
 +    uint8_t *ptr_y, *ptr_cb, *ptr_cr;
 +    int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, sx, sy, uvsx, uvsy;
 +    ptrdiff_t uvlinesize, linesize;
 +    const int lowres     = s->avctx->lowres;
 +    const int op_index   = FFMIN(lowres-1+s->chroma_x_shift, 3);
 +    const int block_s    = 8>>lowres;
 +    const int s_mask     = (2 << lowres) - 1;
 +    const int h_edge_pos = s->h_edge_pos >> lowres;
 +    const int v_edge_pos = s->v_edge_pos >> lowres;
 +    linesize   = s->current_picture.f->linesize[0] << field_based;
 +    uvlinesize = s->current_picture.f->linesize[1] << field_based;
 +
 +    // FIXME obviously not perfect but qpel will not work in lowres anyway
 +    if (s->quarter_sample) {
 +        motion_x /= 2;
 +        motion_y /= 2;
 +    }
 +
 +    if(field_based){
 +        motion_y += (bottom_field - field_select)*((1 << lowres)-1);
 +    }
 +
 +    sx = motion_x & s_mask;
 +    sy = motion_y & s_mask;
 +    src_x = s->mb_x * 2 * block_s + (motion_x >> lowres + 1);
 +    src_y = (mb_y * 2 * block_s >> field_based) + (motion_y >> lowres + 1);
 +
 +    if (s->out_format == FMT_H263) {
 +        uvsx    = ((motion_x >> 1) & s_mask) | (sx & 1);
 +        uvsy    = ((motion_y >> 1) & s_mask) | (sy & 1);
 +        uvsrc_x = src_x >> 1;
 +        uvsrc_y = src_y >> 1;
 +    } else if (s->out_format == FMT_H261) {
 +        // even chroma mv's are full pel in H261
 +        mx      = motion_x / 4;
 +        my      = motion_y / 4;
 +        uvsx    = (2 * mx) & s_mask;
 +        uvsy    = (2 * my) & s_mask;
 +        uvsrc_x = s->mb_x * block_s + (mx >> lowres);
 +        uvsrc_y =    mb_y * block_s + (my >> lowres);
 +    } else {
 +        if(s->chroma_y_shift){
 +            mx      = motion_x / 2;
 +            my      = motion_y / 2;
 +            uvsx    = mx & s_mask;
 +            uvsy    = my & s_mask;
 +            uvsrc_x = s->mb_x * block_s                 + (mx >> lowres + 1);
 +            uvsrc_y =   (mb_y * block_s >> field_based) + (my >> lowres + 1);
 +        } else {
 +            if(s->chroma_x_shift){
 +            //Chroma422
 +                mx = motion_x / 2;
 +                uvsx = mx & s_mask;
 +                uvsy = motion_y & s_mask;
 +                uvsrc_y = src_y;
 +                uvsrc_x = s->mb_x*block_s               + (mx >> (lowres+1));
 +            } else {
 +            //Chroma444
 +                uvsx = motion_x & s_mask;
 +                uvsy = motion_y & s_mask;
 +                uvsrc_x = src_x;
 +                uvsrc_y = src_y;
 +            }
 +        }
 +    }
 +
 +    ptr_y  = ref_picture[0] + src_y   * linesize   + src_x;
 +    ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
 +    ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
 +
 +    if ((unsigned) src_x > FFMAX( h_edge_pos - (!!sx) - 2 * block_s,       0) || uvsrc_y<0 ||
 +        (unsigned) src_y > FFMAX((v_edge_pos >> field_based) - (!!sy) - h, 0)) {
 +        s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, ptr_y,
 +                                 linesize >> field_based, linesize >> field_based,
 +                                 17, 17 + field_based,
 +                                src_x, src_y << field_based, h_edge_pos,
 +                                v_edge_pos);
 +        ptr_y = s->sc.edge_emu_buffer;
 +        if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) {
 +            uint8_t *ubuf = s->sc.edge_emu_buffer + 18 * s->linesize;
 +            uint8_t *vbuf =ubuf + 9 * s->uvlinesize;
 +            s->vdsp.emulated_edge_mc(ubuf,  ptr_cb,
 +                                     uvlinesize >> field_based, uvlinesize >> field_based,
 +                                     9, 9 + field_based,
 +                                    uvsrc_x, uvsrc_y << field_based,
 +                                    h_edge_pos >> 1, v_edge_pos >> 1);
 +            s->vdsp.emulated_edge_mc(vbuf,  ptr_cr,
 +                                     uvlinesize >> field_based,uvlinesize >> field_based,
 +                                     9, 9 + field_based,
 +                                    uvsrc_x, uvsrc_y << field_based,
 +                                    h_edge_pos >> 1, v_edge_pos >> 1);
 +            ptr_cb = ubuf;
 +            ptr_cr = vbuf;
 +        }
 +    }
 +
 +    // FIXME use this for field pix too instead of the obnoxious hack which changes picture.f->data
 +    if (bottom_field) {
 +        dest_y  += s->linesize;
 +        dest_cb += s->uvlinesize;
 +        dest_cr += s->uvlinesize;
 +    }
 +
 +    if (field_select) {
 +        ptr_y   += s->linesize;
 +        ptr_cb  += s->uvlinesize;
 +        ptr_cr  += s->uvlinesize;
 +    }
 +
 +    sx = (sx << 2) >> lowres;
 +    sy = (sy << 2) >> lowres;
 +    pix_op[lowres - 1](dest_y, ptr_y, linesize, h, sx, sy);
 +
 +    if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) {
 +        int hc = s->chroma_y_shift ? (h+1-bottom_field)>>1 : h;
 +        uvsx = (uvsx << 2) >> lowres;
 +        uvsy = (uvsy << 2) >> lowres;
 +        if (hc) {
 +            pix_op[op_index](dest_cb, ptr_cb, uvlinesize, hc, uvsx, uvsy);
 +            pix_op[op_index](dest_cr, ptr_cr, uvlinesize, hc, uvsx, uvsy);
 +        }
 +    }
 +    // FIXME h261 lowres loop filter
 +}
 +
 +static inline void chroma_4mv_motion_lowres(MpegEncContext *s,
 +                                            uint8_t *dest_cb, uint8_t *dest_cr,
 +                                            uint8_t **ref_picture,
 +                                            h264_chroma_mc_func * pix_op,
 +                                            int mx, int my)
 +{
 +    const int lowres     = s->avctx->lowres;
 +    const int op_index   = FFMIN(lowres, 3);
 +    const int block_s    = 8 >> lowres;
 +    const int s_mask     = (2 << lowres) - 1;
 +    const int h_edge_pos = s->h_edge_pos >> lowres + 1;
 +    const int v_edge_pos = s->v_edge_pos >> lowres + 1;
 +    int emu = 0, src_x, src_y, sx, sy;
 +    ptrdiff_t offset;
 +    uint8_t *ptr;
 +
 +    if (s->quarter_sample) {
 +        mx /= 2;
 +        my /= 2;
 +    }
 +
 +    /* In case of 8X8, we construct a single chroma motion vector
 +       with a special rounding */
 +    mx = ff_h263_round_chroma(mx);
 +    my = ff_h263_round_chroma(my);
 +
 +    sx = mx & s_mask;
 +    sy = my & s_mask;
 +    src_x = s->mb_x * block_s + (mx >> lowres + 1);
 +    src_y = s->mb_y * block_s + (my >> lowres + 1);
 +
 +    offset = src_y * s->uvlinesize + src_x;
 +    ptr = ref_picture[1] + offset;
 +    if ((unsigned) src_x > FFMAX(h_edge_pos - (!!sx) - block_s, 0) ||
 +        (unsigned) src_y > FFMAX(v_edge_pos - (!!sy) - block_s, 0)) {
 +        s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, ptr,
 +                                 s->uvlinesize, s->uvlinesize,
 +                                 9, 9,
 +                                 src_x, src_y, h_edge_pos, v_edge_pos);
 +        ptr = s->sc.edge_emu_buffer;
 +        emu = 1;
 +    }
 +    sx = (sx << 2) >> lowres;
 +    sy = (sy << 2) >> lowres;
 +    pix_op[op_index](dest_cb, ptr, s->uvlinesize, block_s, sx, sy);
 +
 +    ptr = ref_picture[2] + offset;
 +    if (emu) {
 +        s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, ptr,
 +                                 s->uvlinesize, s->uvlinesize,
 +                                 9, 9,
 +                                 src_x, src_y, h_edge_pos, v_edge_pos);
 +        ptr = s->sc.edge_emu_buffer;
 +    }
 +    pix_op[op_index](dest_cr, ptr, s->uvlinesize, block_s, sx, sy);
 +}
 +
 +/**
 + * motion compensation of a single macroblock
 + * @param s context
 + * @param dest_y luma destination pointer
 + * @param dest_cb chroma cb/u destination pointer
 + * @param dest_cr chroma cr/v destination pointer
 + * @param dir direction (0->forward, 1->backward)
 + * @param ref_picture array[3] of pointers to the 3 planes of the reference picture
 + * @param pix_op halfpel motion compensation function (average or put normally)
 + * the motion vectors are taken from s->mv and the MV type from s->mv_type
 + */
 +static inline void MPV_motion_lowres(MpegEncContext *s,
 +                                     uint8_t *dest_y, uint8_t *dest_cb,
 +                                     uint8_t *dest_cr,
 +                                     int dir, uint8_t **ref_picture,
 +                                     h264_chroma_mc_func *pix_op)
 +{
 +    int mx, my;
 +    int mb_x, mb_y, i;
 +    const int lowres  = s->avctx->lowres;
 +    const int block_s = 8 >>lowres;
 +
 +    mb_x = s->mb_x;
 +    mb_y = s->mb_y;
 +
 +    switch (s->mv_type) {
 +    case MV_TYPE_16X16:
 +        mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 +                           0, 0, 0,
 +                           ref_picture, pix_op,
 +                           s->mv[dir][0][0], s->mv[dir][0][1],
 +                           2 * block_s, mb_y);
 +        break;
 +    case MV_TYPE_8X8:
 +        mx = 0;
 +        my = 0;
 +        for (i = 0; i < 4; i++) {
 +            hpel_motion_lowres(s, dest_y + ((i & 1) + (i >> 1) *
 +                               s->linesize) * block_s,
 +                               ref_picture[0], 0, 0,
 +                               (2 * mb_x + (i & 1)) * block_s,
 +                               (2 * mb_y + (i >> 1)) * block_s,
 +                               s->width, s->height, s->linesize,
 +                               s->h_edge_pos >> lowres, s->v_edge_pos >> lowres,
 +                               block_s, block_s, pix_op,
 +                               s->mv[dir][i][0], s->mv[dir][i][1]);
 +
 +            mx += s->mv[dir][i][0];
 +            my += s->mv[dir][i][1];
 +        }
 +
 +        if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY))
 +            chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture,
 +                                     pix_op, mx, my);
 +        break;
 +    case MV_TYPE_FIELD:
 +        if (s->picture_structure == PICT_FRAME) {
 +            /* top field */
 +            mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 +                               1, 0, s->field_select[dir][0],
 +                               ref_picture, pix_op,
 +                               s->mv[dir][0][0], s->mv[dir][0][1],
 +                               block_s, mb_y);
 +            /* bottom field */
 +            mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 +                               1, 1, s->field_select[dir][1],
 +                               ref_picture, pix_op,
 +                               s->mv[dir][1][0], s->mv[dir][1][1],
 +                               block_s, mb_y);
 +        } else {
 +            if (s->picture_structure != s->field_select[dir][0] + 1 &&
 +                s->pict_type != AV_PICTURE_TYPE_B && !s->first_field) {
 +                ref_picture = s->current_picture_ptr->f->data;
 +
 +            }
 +            mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 +                               0, 0, s->field_select[dir][0],
 +                               ref_picture, pix_op,
 +                               s->mv[dir][0][0],
 +                               s->mv[dir][0][1], 2 * block_s, mb_y >> 1);
 +            }
 +        break;
 +    case MV_TYPE_16X8:
 +        for (i = 0; i < 2; i++) {
 +            uint8_t **ref2picture;
 +
 +            if (s->picture_structure == s->field_select[dir][i] + 1 ||
 +                s->pict_type == AV_PICTURE_TYPE_B || s->first_field) {
 +                ref2picture = ref_picture;
 +            } else {
 +                ref2picture = s->current_picture_ptr->f->data;
 +            }
 +
 +            mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 +                               0, 0, s->field_select[dir][i],
 +                               ref2picture, pix_op,
 +                               s->mv[dir][i][0], s->mv[dir][i][1] +
 +                               2 * block_s * i, block_s, mb_y >> 1);
 +
 +            dest_y  +=  2 * block_s *  s->linesize;
 +            dest_cb += (2 * block_s >> s->chroma_y_shift) * s->uvlinesize;
 +            dest_cr += (2 * block_s >> s->chroma_y_shift) * s->uvlinesize;
 +        }
 +        break;
 +    case MV_TYPE_DMV:
 +        if (s->picture_structure == PICT_FRAME) {
 +            for (i = 0; i < 2; i++) {
 +                int j;
 +                for (j = 0; j < 2; j++) {
 +                    mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 +                                       1, j, j ^ i,
 +                                       ref_picture, pix_op,
 +                                       s->mv[dir][2 * i + j][0],
 +                                       s->mv[dir][2 * i + j][1],
 +                                       block_s, mb_y);
 +                }
 +                pix_op = s->h264chroma.avg_h264_chroma_pixels_tab;
 +            }
 +        } else {
 +            for (i = 0; i < 2; i++) {
 +                mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 +                                   0, 0, s->picture_structure != i + 1,
 +                                   ref_picture, pix_op,
 +                                   s->mv[dir][2 * i][0],s->mv[dir][2 * i][1],
 +                                   2 * block_s, mb_y >> 1);
 +
 +                // after put we make avg of the same block
 +                pix_op = s->h264chroma.avg_h264_chroma_pixels_tab;
 +
 +                // opposite parity is always in the same
 +                // frame if this is second field
 +                if (!s->first_field) {
 +                    ref_picture = s->current_picture_ptr->f->data;
                  }
              }
 -            av_log(s->avctx, AV_LOG_DEBUG, "\n");
          }
 +        break;
 +    default:
 +        av_assert2(0);
      }
  }
  
@@@ -2352,14 -1407,14 +2289,14 @@@ static int lowest_referenced_row(MpegEn
      }
  
      for (i = 0; i < mvs; i++) {
 -        my = s->mv[dir][i][1]<<qpel_shift;
 +        my = s->mv[dir][i][1];
          my_max = FFMAX(my_max, my);
          my_min = FFMIN(my_min, my);
      }
  
 -    off = (FFMAX(-my_min, my_max) + 63) >> 6;
 +    off = ((FFMAX(-my_min, my_max)<<qpel_shift) + 63) >> 6;
  
 -    return FFMIN(FFMAX(s->mb_y + off, 0), s->mb_height-1);
 +    return av_clip(s->mb_y + off, 0, s->mb_height - 1);
  unhandled:
      return s->mb_height-1;
  }
@@@ -2436,15 -1491,18 +2373,15 @@@ void ff_clean_intra_table_entries(MpegE
   */
  static av_always_inline
  void mpv_decode_mb_internal(MpegEncContext *s, int16_t block[12][64],
 -                            int is_mpeg12)
 +                            int lowres_flag, int is_mpeg12)
  {
      const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
  
 -#if FF_API_XVMC
 -FF_DISABLE_DEPRECATION_WARNINGS
 -    if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
 -        ff_xvmc_decode_mb(s);//xvmc uses pblocks
 +    if (CONFIG_XVMC &&
 +        s->avctx->hwaccel && s->avctx->hwaccel->decode_mb) {
 +        s->avctx->hwaccel->decode_mb(s);//xvmc uses pblocks
          return;
      }
 -FF_ENABLE_DEPRECATION_WARNINGS
 -#endif /* FF_API_XVMC */
  
      if(s->avctx->debug&FF_DEBUG_DCT_COEFF) {
         /* print DCT coefficients */
      else if (!is_mpeg12 && (s->h263_pred || s->h263_aic))
          s->mbintra_table[mb_xy]=1;
  
 -    if ((s->avctx->flags & CODEC_FLAG_PSNR) ||
 +    if ((s->avctx->flags & CODEC_FLAG_PSNR) || s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor ||
          !(s->encoding && (s->intra_only || s->pict_type == AV_PICTURE_TYPE_B) &&
            s->avctx->mb_decision != FF_MB_DECISION_RD)) { // FIXME precalc
          uint8_t *dest_y, *dest_cb, *dest_cr;
          qpel_mc_func (*op_qpix)[16];
          const int linesize   = s->current_picture.f->linesize[0]; //not s->linesize as this would be wrong for field pics
          const int uvlinesize = s->current_picture.f->linesize[1];
 -        const int readable= s->pict_type != AV_PICTURE_TYPE_B || s->encoding || s->avctx->draw_horiz_band;
 -        const int block_size = 8;
 +        const int readable= s->pict_type != AV_PICTURE_TYPE_B || s->encoding || s->avctx->draw_horiz_band || lowres_flag;
 +        const int block_size= lowres_flag ? 8>>s->avctx->lowres : 8;
  
          /* avoid copy if macroblock skipped in last frame too */
          /* skip only during decoding as we might trash the buffers during encoding a bit */
  
              if (s->mb_skipped) {
                  s->mb_skipped= 0;
 -                assert(s->pict_type!=AV_PICTURE_TYPE_I);
 +                av_assert2(s->pict_type!=AV_PICTURE_TYPE_I);
                  *mbskip_ptr = 1;
              } else if(!s->current_picture.reference) {
                  *mbskip_ptr = 1;
                      }
                  }
  
 -                op_qpix= s->me.qpel_put;
 -                if ((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){
 -                    op_pix = s->hdsp.put_pixels_tab;
 +                if(lowres_flag){
 +                    h264_chroma_mc_func *op_pix = s->h264chroma.put_h264_chroma_pixels_tab;
 +
 +                    if (s->mv_dir & MV_DIR_FORWARD) {
 +                        MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.f->data, op_pix);
 +                        op_pix = s->h264chroma.avg_h264_chroma_pixels_tab;
 +                    }
 +                    if (s->mv_dir & MV_DIR_BACKWARD) {
 +                        MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.f->data, op_pix);
 +                    }
                  }else{
 -                    op_pix = s->hdsp.put_no_rnd_pixels_tab;
 -                }
 -                if (s->mv_dir & MV_DIR_FORWARD) {
 -                    ff_mpv_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.f->data, op_pix, op_qpix);
 -                    op_pix = s->hdsp.avg_pixels_tab;
 -                    op_qpix= s->me.qpel_avg;
 -                }
 -                if (s->mv_dir & MV_DIR_BACKWARD) {
 -                    ff_mpv_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.f->data, op_pix, op_qpix);
 +                    op_qpix = s->me.qpel_put;
 +                    if ((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){
 +                        op_pix = s->hdsp.put_pixels_tab;
 +                    }else{
 +                        op_pix = s->hdsp.put_no_rnd_pixels_tab;
 +                    }
 +                    if (s->mv_dir & MV_DIR_FORWARD) {
 +                        ff_mpv_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.f->data, op_pix, op_qpix);
 +                        op_pix = s->hdsp.avg_pixels_tab;
 +                        op_qpix= s->me.qpel_avg;
 +                    }
 +                    if (s->mv_dir & MV_DIR_BACKWARD) {
 +                        ff_mpv_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.f->data, op_pix, op_qpix);
 +                    }
                  }
              }
  
                      }else{
                          //chroma422
                          dct_linesize = uvlinesize << s->interlaced_dct;
 -                        dct_offset   = s->interlaced_dct ? uvlinesize : uvlinesize * 8;
 +                        dct_offset   = s->interlaced_dct ? uvlinesize : uvlinesize*block_size;
  
                          add_dct(s, block[4], 4, dest_cb, dct_linesize);
                          add_dct(s, block[5], 5, dest_cr, dct_linesize);
                          add_dct(s, block[6], 6, dest_cb+dct_offset, dct_linesize);
                          add_dct(s, block[7], 7, dest_cr+dct_offset, dct_linesize);
                          if(!s->chroma_x_shift){//Chroma444
 -                            add_dct(s, block[8], 8, dest_cb+8, dct_linesize);
 -                            add_dct(s, block[9], 9, dest_cr+8, dct_linesize);
 -                            add_dct(s, block[10], 10, dest_cb+8+dct_offset, dct_linesize);
 -                            add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize);
 +                            add_dct(s, block[8], 8, dest_cb+block_size, dct_linesize);
 +                            add_dct(s, block[9], 9, dest_cr+block_size, dct_linesize);
 +                            add_dct(s, block[10], 10, dest_cb+block_size+dct_offset, dct_linesize);
 +                            add_dct(s, block[11], 11, dest_cr+block_size+dct_offset, dct_linesize);
                          }
                      }
                  }//fi gray
                      }else{
  
                          dct_linesize = uvlinesize << s->interlaced_dct;
 -                        dct_offset   = s->interlaced_dct ? uvlinesize : uvlinesize * 8;
 +                        dct_offset   = s->interlaced_dct ? uvlinesize : uvlinesize*block_size;
  
                          s->idsp.idct_put(dest_cb,              dct_linesize, block[4]);
                          s->idsp.idct_put(dest_cr,              dct_linesize, block[5]);
                          s->idsp.idct_put(dest_cb + dct_offset, dct_linesize, block[6]);
                          s->idsp.idct_put(dest_cr + dct_offset, dct_linesize, block[7]);
                          if(!s->chroma_x_shift){//Chroma444
 -                            s->idsp.idct_put(dest_cb + 8,              dct_linesize, block[8]);
 -                            s->idsp.idct_put(dest_cr + 8,              dct_linesize, block[9]);
 -                            s->idsp.idct_put(dest_cb + 8 + dct_offset, dct_linesize, block[10]);
 -                            s->idsp.idct_put(dest_cr + 8 + dct_offset, dct_linesize, block[11]);
 +                            s->idsp.idct_put(dest_cb + block_size,              dct_linesize, block[8]);
 +                            s->idsp.idct_put(dest_cr + block_size,              dct_linesize, block[9]);
 +                            s->idsp.idct_put(dest_cb + block_size + dct_offset, dct_linesize, block[10]);
 +                            s->idsp.idct_put(dest_cr + block_size + dct_offset, dct_linesize, block[11]);
                          }
                      }
                  }//gray
  skip_idct:
          if(!readable){
              s->hdsp.put_pixels_tab[0][0](s->dest[0], dest_y ,   linesize,16);
 -            s->hdsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift);
 -            s->hdsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift);
 +            if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) {
 +                s->hdsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift);
 +                s->hdsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift);
 +            }
          }
      }
  }
@@@ -2687,25 -1731,23 +2624,25 @@@ void ff_mpv_decode_mb(MpegEncContext *s
  {
  #if !CONFIG_SMALL
      if(s->out_format == FMT_MPEG1) {
 -        mpv_decode_mb_internal(s, block, 1);
 +        if(s->avctx->lowres) mpv_decode_mb_internal(s, block, 1, 1);
 +        else                 mpv_decode_mb_internal(s, block, 0, 1);
      } else
  #endif
 -        mpv_decode_mb_internal(s, block, 0);
 +    if(s->avctx->lowres) mpv_decode_mb_internal(s, block, 1, 0);
 +    else                  mpv_decode_mb_internal(s, block, 0, 0);
  }
  
  void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)
  {
 -    ff_draw_horiz_band(s->avctx, s->current_picture.f,
 -                       s->last_picture.f, y, h, s->picture_structure,
 +    ff_draw_horiz_band(s->avctx, s->current_picture_ptr->f,
 +                       s->last_picture_ptr ? s->last_picture_ptr->f : NULL, y, h, s->picture_structure,
                         s->first_field, s->low_delay);
  }
  
  void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename
      const int linesize   = s->current_picture.f->linesize[0]; //not s->linesize as this would be wrong for field pics
      const int uvlinesize = s->current_picture.f->linesize[1];
 -    const int mb_size= 4;
 +    const int mb_size= 4 - s->avctx->lowres;
  
      s->block_index[0]= s->b8_stride*(s->mb_y*2    ) - 2 + s->mb_x*2;
      s->block_index[1]= s->b8_stride*(s->mb_y*2    ) - 1 + s->mb_x*2;
      s->block_index[5]= s->mb_stride*(s->mb_y + s->mb_height + 2) + s->b8_stride*s->mb_height*2 + s->mb_x - 1;
      //block_index is not used by mpeg2, so it is not affected by chroma_format
  
 -    s->dest[0] = s->current_picture.f->data[0] + ((s->mb_x - 1) <<  mb_size);
 -    s->dest[1] = s->current_picture.f->data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift));
 -    s->dest[2] = s->current_picture.f->data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift));
 +    s->dest[0] = s->current_picture.f->data[0] + (int)((s->mb_x - 1U) <<  mb_size);
 +    s->dest[1] = s->current_picture.f->data[1] + (int)((s->mb_x - 1U) << (mb_size - s->chroma_x_shift));
 +    s->dest[2] = s->current_picture.f->data[2] + (int)((s->mb_x - 1U) << (mb_size - s->chroma_x_shift));
  
      if(!(s->pict_type==AV_PICTURE_TYPE_B && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME))
      {
              s->dest[0] += (s->mb_y>>1) *   linesize << mb_size;
              s->dest[1] += (s->mb_y>>1) * uvlinesize << (mb_size - s->chroma_y_shift);
              s->dest[2] += (s->mb_y>>1) * uvlinesize << (mb_size - s->chroma_y_shift);
 -            assert((s->mb_y&1) == (s->picture_structure == PICT_BOTTOM_FIELD));
 +            av_assert1((s->mb_y&1) == (s->picture_structure == PICT_BOTTOM_FIELD));
          }
      }
  }
@@@ -2750,7 -1792,6 +2687,7 @@@ void ff_mpeg_flush(AVCodecContext *avct
      ff_mpeg_unref_picture(s->avctx, &s->next_picture);
  
      s->mb_x= s->mb_y= 0;
 +    s->closed_gop= 0;
  
      s->parse_context.state= -1;
      s->parse_context.frame_start_found= 0;