@@ -565,6 +565,14 @@ int opt_cpuflags(const char *opt, const char *arg)

         { "fma4"    , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_FMA4     },    .unit = "flags" },

         { "3dnow"   , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOW    },    .unit = "flags" },

         { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOWEXT },    .unit = "flags" },

+

+        { "armv5te",  NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV5TE  },    .unit = "flags" },

+        { "armv6",    NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6    },    .unit = "flags" },

+        { "armv6t2",  NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6T2  },    .unit = "flags" },

+        { "vfp",      NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFP      },    .unit = "flags" },

+        { "vfpv3",    NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFPV3    },    .unit = "flags" },

+        { "neon",     NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_NEON     },    .unit = "flags" },

+

         { NULL },

     };

     static const AVClass class = {

@@ -260,7 +260,6 @@ static int64_t duration = AV_NOPTS_VALUE;

 static int workaround_bugs = 1;

 static int fast = 0;

 static int genpts = 0;

-static int lowres = 0;

 static int idct = FF_IDCT_AUTO;

 static enum AVDiscard skip_frame       = AVDISCARD_DEFAULT;

 static enum AVDiscard skip_idct        = AVDISCARD_DEFAULT;

@@ -1325,7 +1324,7 @@ static void alloc_picture(void *opaque)

         /* SDL allocates a buffer smaller than requested if the video

          * overlay hardware is unable to support the requested size. */

         fprintf(stderr, "Error: the video system does not support an image\n"

-                        "size of %dx%d pixels. Try using -lowres or -vf \"scale=w:h\"\n"

+                        "size of %dx%d pixels. Try using -vf \"scale=w:h\"\n"

                         "to reduce the image size.\n", vp->width, vp->height );

         do_exit(is);

     }

@@ -3085,7 +3084,6 @@ static const OptionDef options[] = {

     { "fast", OPT_BOOL | OPT_EXPERT, { (void*)&fast }, "non spec compliant optimizations", "" },

     { "genpts", OPT_BOOL | OPT_EXPERT, { (void*)&genpts }, "generate pts", "" },

     { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},

-    { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&lowres }, "", "" },

     { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_loop_filter }, "", "" },

     { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_frame }, "", "" },

     { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_idct }, "", "" },

@@ -336,7 +336,7 @@ void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx)

     put_pixels_clamped_axp_p = c->put_pixels_clamped;

     add_pixels_clamped_axp_p = c->add_pixels_clamped;

-    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 &&

+    if (avctx->bits_per_raw_sample <= 8 &&

         (avctx->idct_algo == FF_IDCT_AUTO ||

          avctx->idct_algo == FF_IDCT_SIMPLEALPHA)) {

         c->idct_put = ff_simple_idct_put_axp;

@@ -19,6 +19,8 @@

  */

 #include <stdint.h>

+

+#include "libavutil/arm/cpu.h"

 #include "libavutil/attributes.h"

 #include "libavcodec/ac3dsp.h"

 #include "config.h"

@@ -47,13 +49,15 @@ void ff_ac3_update_bap_counts_arm(uint16_t mant_cnt[16], uint8_t *bap, int len);

 av_cold void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact)

 {

+    int cpu_flags = av_get_cpu_flags();

+

     c->update_bap_counts         = ff_ac3_update_bap_counts_arm;

-    if (HAVE_ARMV6) {

+    if (have_armv6(cpu_flags)) {

         c->bit_alloc_calc_bap    = ff_ac3_bit_alloc_calc_bap_armv6;

     }

-    if (HAVE_NEON) {

+    if (have_neon(cpu_flags)) {

         c->ac3_exponent_min      = ff_ac3_exponent_min_neon;

         c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_neon;

         c->ac3_lshift_int16      = ff_ac3_lshift_int16_neon;

@@ -19,6 +19,8 @@

  */

 #include "config.h"

+

+#include "libavutil/arm/cpu.h"

 #include "libavutil/attributes.h"

 #include "libavcodec/dcadsp.h"

@@ -27,6 +29,8 @@ void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs,

 av_cold void ff_dcadsp_init_arm(DCADSPContext *s)

 {

-    if (HAVE_NEON)

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags))

         s->lfe_fir = ff_dca_lfe_fir_neon;

 }

@@ -19,6 +19,7 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/dsputil.h"

 #include "dsputil_arm.h"

@@ -76,11 +77,12 @@ static void simple_idct_arm_add(uint8_t *dest, int line_size, DCTELEM *block)

 void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)

 {

     const int high_bit_depth = avctx->bits_per_raw_sample > 8;

+    int cpu_flags = av_get_cpu_flags();

     ff_put_pixels_clamped = c->put_pixels_clamped;

     ff_add_pixels_clamped = c->add_pixels_clamped;

-    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8) {

+    if (avctx->bits_per_raw_sample <= 8) {

         if(avctx->idct_algo == FF_IDCT_AUTO ||

            avctx->idct_algo == FF_IDCT_ARM){

             c->idct_put              = j_rev_dct_arm_put;

@@ -117,8 +119,8 @@ void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)

     c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_arm;

     }

-    if (HAVE_ARMV5TE) ff_dsputil_init_armv5te(c, avctx);

-    if (HAVE_ARMV6)   ff_dsputil_init_armv6(c, avctx);

-    if (HAVE_ARMVFP)  ff_dsputil_init_vfp(c, avctx);

-    if (HAVE_NEON)    ff_dsputil_init_neon(c, avctx);

+    if (have_armv5te(cpu_flags)) ff_dsputil_init_armv5te(c, avctx);

+    if (have_armv6(cpu_flags))   ff_dsputil_init_armv6(c, avctx);

+    if (have_vfp(cpu_flags))     ff_dsputil_init_vfp(c, avctx);

+    if (have_neon(cpu_flags))    ff_dsputil_init_neon(c, avctx);

 }

@@ -29,7 +29,7 @@ void ff_prefetch_arm(void *mem, int stride, int h);

 av_cold void ff_dsputil_init_armv5te(DSPContext *c, AVCodecContext *avctx)

 {

-    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 &&

+    if (avctx->bits_per_raw_sample <= 8 &&

         (avctx->idct_algo == FF_IDCT_AUTO ||

          avctx->idct_algo == FF_IDCT_SIMPLEARMV5TE)) {

         c->idct_put              = ff_simple_idct_put_armv5te;

@@ -74,7 +74,7 @@ av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx)

 {

     const int high_bit_depth = avctx->bits_per_raw_sample > 8;

-    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 &&

+    if (avctx->bits_per_raw_sample <= 8 &&

         (avctx->idct_algo == FF_IDCT_AUTO ||

          avctx->idct_algo == FF_IDCT_SIMPLEARMV6)) {

         c->idct_put              = ff_simple_idct_put_armv6;

@@ -182,7 +182,7 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)

 {

     const int high_bit_depth = avctx->bits_per_raw_sample > 8;

-    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8) {

+    if (avctx->bits_per_raw_sample <= 8) {

         if (avctx->idct_algo == FF_IDCT_AUTO ||

             avctx->idct_algo == FF_IDCT_SIMPLENEON) {

             c->idct_put              = ff_simple_idct_put_neon;

@@ -18,6 +18,7 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/dsputil.h"

 #include "dsputil_arm.h"

@@ -28,7 +29,9 @@ void ff_vector_fmul_reverse_vfp(float *dst, const float *src0,

 void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx)

 {

-    if (!HAVE_VFPV3)

+    int cpu_flags = av_get_cpu_flags();

+

+    if (!have_vfpv3(cpu_flags))

         c->vector_fmul = ff_vector_fmul_vfp;

     c->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;

 }

@@ -18,6 +18,8 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+#include "libavutil/arm/cpu.h"

+

 #define CONFIG_FFT_FLOAT 0

 #include "libavcodec/fft.h"

@@ -27,7 +29,9 @@ void ff_mdct_fixed_calcw_neon(FFTContext *s, FFTDouble *o, const FFTSample *i);

 av_cold void ff_fft_fixed_init_arm(FFTContext *s)

 {

-    if (HAVE_NEON) {

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags)) {

         s->fft_permutation = FF_FFT_PERM_SWAP_LSBS;

         s->fft_calc        = ff_fft_fixed_calc_neon;

@@ -18,6 +18,7 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/fft.h"

 #include "libavcodec/rdft.h"

 #include "libavcodec/synth_filter.h"

@@ -39,7 +40,9 @@ void ff_synth_filter_float_neon(FFTContext *imdct,

 av_cold void ff_fft_init_arm(FFTContext *s)

 {

-    if (HAVE_NEON) {

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags)) {

         s->fft_permute  = ff_fft_permute_neon;

         s->fft_calc     = ff_fft_calc_neon;

 #if CONFIG_MDCT

@@ -54,7 +57,9 @@ av_cold void ff_fft_init_arm(FFTContext *s)

 #if CONFIG_RDFT

 av_cold void ff_rdft_init_arm(RDFTContext *s)

 {

-    if (HAVE_NEON)

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags))

         s->rdft_calc    = ff_rdft_calc_neon;

 }

 #endif

@@ -62,7 +67,9 @@ av_cold void ff_rdft_init_arm(RDFTContext *s)

 #if CONFIG_DCA_DECODER

 av_cold void ff_synth_filter_init_arm(SynthFilterContext *s)

 {

-    if (HAVE_NEON)

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags))

         s->synth_filter_float = ff_synth_filter_float_neon;

 }

 #endif

@@ -20,6 +20,7 @@

 #include <stdint.h>

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/avcodec.h"

 #include "libavcodec/fmtconvert.h"

@@ -33,11 +34,13 @@ void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len);

 void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx)

 {

-    if (HAVE_ARMVFP && HAVE_ARMV6) {

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_vfp(cpu_flags) && have_armv6(cpu_flags)) {

         c->float_to_int16 = ff_float_to_int16_vfp;

     }

-    if (HAVE_NEON) {

+    if (have_neon(cpu_flags)) {

         c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_neon;

         if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {

@@ -20,6 +20,7 @@

 #include <stdint.h>

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/dsputil.h"

 #include "libavcodec/h264dsp.h"

@@ -99,5 +100,8 @@ static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const i

 void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)

 {

-    if (HAVE_NEON) ff_h264dsp_init_neon(c, bit_depth, chroma_format_idc);

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags))

+        ff_h264dsp_init_neon(c, bit_depth, chroma_format_idc);

 }

@@ -20,6 +20,7 @@

 #include <stdint.h>

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/h264pred.h"

 void ff_pred16x16_vert_neon(uint8_t *src, int stride);

@@ -77,5 +78,8 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int b

 void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth, const int chroma_format_idc)

 {

-    if (HAVE_NEON)    ff_h264_pred_init_neon(h, codec_id, bit_depth, chroma_format_idc);

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags))

+        ff_h264_pred_init_neon(h, codec_id, bit_depth, chroma_format_idc);

 }

@@ -19,6 +19,8 @@

  */

 #include <stdint.h>

+

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/mpegaudiodsp.h"

 #include "config.h"

@@ -27,7 +29,9 @@ void ff_mpadsp_apply_window_fixed_armv6(int32_t *synth_buf, int32_t *window,

 void ff_mpadsp_init_arm(MPADSPContext *s)

 {

-    if (HAVE_ARMV6) {

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_armv6(cpu_flags)) {

         s->apply_window_fixed = ff_mpadsp_apply_window_fixed_armv6;

     }

 }

@@ -18,6 +18,7 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/avcodec.h"

 #include "libavcodec/dsputil.h"

 #include "libavcodec/mpegvideo.h"

@@ -40,11 +41,12 @@ void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, DCTELEM *block,

 void ff_MPV_common_init_arm(MpegEncContext *s)

 {

-#if HAVE_ARMV5TE

-    ff_MPV_common_init_armv5te(s);

-#endif

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_armv5te(cpu_flags))

+        ff_MPV_common_init_armv5te(s);

-    if (HAVE_NEON) {

+    if (have_neon(cpu_flags)) {

         s->dct_unquantize_h263_intra = ff_dct_unquantize_h263_intra_neon;

         s->dct_unquantize_h263_inter = ff_dct_unquantize_h263_inter_neon;

     }

@@ -19,6 +19,7 @@

  */

 #include "config.h"

+#include "libavutil/arm/cpu.h"

 #include "libavutil/attributes.h"

 #include "libavcodec/sbrdsp.h"

@@ -51,7 +52,9 @@ void ff_sbr_hf_apply_noise_3_neon(float Y[64][2], const float *s_m,

 av_cold void ff_sbrdsp_init_arm(SBRDSPContext *s)

 {

-    if (HAVE_NEON) {

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags)) {

         s->sum64x5 = ff_sbr_sum64x5_neon;

         s->sum_square = ff_sbr_sum_square_neon;

         s->neg_odd_64 = ff_sbr_neg_odd_64_neon;

@@ -19,6 +19,8 @@

  */

 #include <stdint.h>

+

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/avcodec.h"

 #include "libavcodec/vp56dsp.h"

@@ -27,7 +29,9 @@ void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, int stride, int t);

 void ff_vp56dsp_init_arm(VP56DSPContext *s, enum CodecID codec)

 {

-    if (codec != CODEC_ID_VP5 && HAVE_NEON) {

+    int cpu_flags = av_get_cpu_flags();

+

+    if (codec != CODEC_ID_VP5 && have_neon(cpu_flags)) {

         s->edge_filter_hor = ff_vp6_edge_filter_hor_neon;

         s->edge_filter_ver = ff_vp6_edge_filter_ver_neon;

     }

@@ -17,6 +17,8 @@

  */

 #include <stdint.h>

+

+#include "libavutil/arm/cpu.h"

 #include "libavcodec/vp8dsp.h"

 void ff_vp8_luma_dc_wht_dc_armv6(DCTELEM block[4][4][16], DCTELEM dc[16]);

@@ -301,7 +303,9 @@ av_cold void ff_vp8dsp_init_arm(VP8DSPContext *dsp)

         dsp->put_vp8_bilinear_pixels_tab[2][2][0] = ff_put_vp8_bilin4_v_##opt; \

         dsp->put_vp8_bilinear_pixels_tab[2][2][1] = ff_put_vp8_bilin4_hv_##opt; \

         dsp->put_vp8_bilinear_pixels_tab[2][2][2] = ff_put_vp8_bilin4_hv_##opt

-    if (HAVE_NEON) {

+    int cpu_flags = av_get_cpu_flags();

+

+    if (have_neon(cpu_flags)) {

         set_func_ptrs(neon);

     } else if (HAVE_ARMV6) {

         set_func_ptrs(armv6);

@@ -1451,7 +1451,7 @@ typedef struct AVCodecContext {

     int width, height;

     /**

-     * Bitstream width / height, may be different from width/height if lowres enabled.

+     * Bitstream width / height, may be different from width/height.

      * - encoding: unused

      * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.

      */

@@ -2649,7 +2649,7 @@ typedef struct AVCodecContext {

      * - encoding: unused

      * - decoding: Set by user.

      */

-     int lowres;

+    attribute_deprecated int lowres;

     /**

      * the picture in the bitstream

@@ -2920,7 +2920,7 @@ typedef struct AVCodec {

     const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0

     const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1

     const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0

-    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder

+    attribute_deprecated uint8_t max_lowres; ///< maximum value for lowres supported by the decoder

     const AVClass *priv_class;              ///< AVClass for the private context

     const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}

@@ -381,38 +381,6 @@ void ff_put_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,

     }

 }

-static void put_pixels_clamped4_c(const DCTELEM *block, uint8_t *restrict pixels,

-                                 int line_size)

-{

-    int i;

-

-    /* read the pixels */

-    for(i=0;i<4;i++) {

-        pixels[0] = av_clip_uint8(block[0]);

-        pixels[1] = av_clip_uint8(block[1]);

-        pixels[2] = av_clip_uint8(block[2]);

-        pixels[3] = av_clip_uint8(block[3]);

-

-        pixels += line_size;

-        block += 8;

-    }

-}

-

-static void put_pixels_clamped2_c(const DCTELEM *block, uint8_t *restrict pixels,

-                                 int line_size)

-{

-    int i;

-

-    /* read the pixels */

-    for(i=0;i<2;i++) {

-        pixels[0] = av_clip_uint8(block[0]);

-        pixels[1] = av_clip_uint8(block[1]);

-

-        pixels += line_size;

-        block += 8;

-    }

-}

-

 void ff_put_signed_pixels_clamped_c(const DCTELEM *block,

                                     uint8_t *restrict pixels,

                                     int line_size)

@@ -454,36 +422,6 @@ void ff_add_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,

     }

 }

-static void add_pixels_clamped4_c(const DCTELEM *block, uint8_t *restrict pixels,

-                          int line_size)

-{

-    int i;

-

-    /* read the pixels */

-    for(i=0;i<4;i++) {

-        pixels[0] = av_clip_uint8(pixels[0] + block[0]);

-        pixels[1] = av_clip_uint8(pixels[1] + block[1]);

-        pixels[2] = av_clip_uint8(pixels[2] + block[2]);

-        pixels[3] = av_clip_uint8(pixels[3] + block[3]);

-        pixels += line_size;

-        block += 8;

-    }

-}

-

-static void add_pixels_clamped2_c(const DCTELEM *block, uint8_t *restrict pixels,

-                          int line_size)

-{

-    int i;

-

-    /* read the pixels */

-    for(i=0;i<2;i++) {

-        pixels[0] = av_clip_uint8(pixels[0] + block[0]);

-        pixels[1] = av_clip_uint8(pixels[1] + block[1]);

-        pixels += line_size;

-        block += 8;

-    }

-}

-

 static int sum_abs_dctelem_c(DCTELEM *block)

 {

     int sum=0, i;

@@ -2746,37 +2684,6 @@ static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block)

     ff_add_pixels_clamped_c(block, dest, line_size);

 }

-static void ff_jref_idct4_put(uint8_t *dest, int line_size, DCTELEM *block)

-{

-    ff_j_rev_dct4 (block);

-    put_pixels_clamped4_c(block, dest, line_size);

-}

-static void ff_jref_idct4_add(uint8_t *dest, int line_size, DCTELEM *block)

-{

-    ff_j_rev_dct4 (block);

-    add_pixels_clamped4_c(block, dest, line_size);

-}

-

-static void ff_jref_idct2_put(uint8_t *dest, int line_size, DCTELEM *block)

-{

-    ff_j_rev_dct2 (block);

-    put_pixels_clamped2_c(block, dest, line_size);

-}

-static void ff_jref_idct2_add(uint8_t *dest, int line_size, DCTELEM *block)

-{

-    ff_j_rev_dct2 (block);

-    add_pixels_clamped2_c(block, dest, line_size);

-}

-

-static void ff_jref_idct1_put(uint8_t *dest, int line_size, DCTELEM *block)

-{

-    dest[0] = av_clip_uint8((block[0] + 4)>>3);

-}

-static void ff_jref_idct1_add(uint8_t *dest, int line_size, DCTELEM *block)

-{

-    dest[0] = av_clip_uint8(dest[0] + ((block[0] + 4)>>3));

-}

-

 static void just_return(void *mem av_unused, int stride av_unused, int h av_unused) { return; }

 /* init static data */

@@ -2843,28 +2750,12 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)

     }

 #endif //CONFIG_ENCODERS

-    if(avctx->lowres==1){

-        c->idct_put= ff_jref_idct4_put;

-        c->idct_add= ff_jref_idct4_add;

-        c->idct    = ff_j_rev_dct4;

-        c->idct_permutation_type= FF_NO_IDCT_PERM;

-    }else if(avctx->lowres==2){

-        c->idct_put= ff_jref_idct2_put;

-        c->idct_add= ff_jref_idct2_add;

-        c->idct    = ff_j_rev_dct2;

-        c->idct_permutation_type= FF_NO_IDCT_PERM;

-    }else if(avctx->lowres==3){

-        c->idct_put= ff_jref_idct1_put;

-        c->idct_add= ff_jref_idct1_add;

-        c->idct    = ff_j_rev_dct1;

-        c->idct_permutation_type= FF_NO_IDCT_PERM;

-    }else{

-        if (avctx->bits_per_raw_sample == 10) {

-            c->idct_put              = ff_simple_idct_put_10;

-            c->idct_add              = ff_simple_idct_add_10;

-            c->idct                  = ff_simple_idct_10;

-            c->idct_permutation_type = FF_NO_IDCT_PERM;

-        } else {

+    if (avctx->bits_per_raw_sample == 10) {

+        c->idct_put              = ff_simple_idct_put_10;

+        c->idct_add              = ff_simple_idct_add_10;

+        c->idct                  = ff_simple_idct_10;

+        c->idct_permutation_type = FF_NO_IDCT_PERM;

+    } else {

         if(avctx->idct_algo==FF_IDCT_INT){

             c->idct_put= ff_jref_idct_put;

             c->idct_add= ff_jref_idct_add;

@@ -2895,7 +2786,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)

             c->idct     = ff_simple_idct_8;

             c->idct_permutation_type= FF_NO_IDCT_PERM;

         }

-        }

     }

     c->diff_pixels = diff_pixels_c;

@@ -46,9 +46,6 @@ void ff_fdct248_islow_8(DCTELEM *data);

 void ff_fdct248_islow_10(DCTELEM *data);

 void ff_j_rev_dct (DCTELEM *data);

-void ff_j_rev_dct4 (DCTELEM *data);

-void ff_j_rev_dct2 (DCTELEM *data);

-void ff_j_rev_dct1 (DCTELEM *data);

 void ff_wmv2_idct_c(DCTELEM *data);

 void ff_fdct_mmx(DCTELEM *block);

@@ -311,13 +311,7 @@ av_cold int ff_dvvideo_init(AVCodecContext *avctx)

     /* 248DCT setup */

     s->fdct[1]     = dsp.fdct248;

     s->idct_put[1] = ff_simple_idct248_put;  // FIXME: need to add it to DSP

-    if (avctx->lowres){

-        for (i = 0; i < 64; i++){

-            int j = ff_zigzag248_direct[i];

-            s->dv_zigzag[1][i] = dsp.idct_permutation[(j & 7) + (j & 8) * 4 + (j & 48) / 2];

-        }

-    }else

-        memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64);

+    memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64);

     avctx->coded_frame = &s->picture;

     s->avctx = avctx;

@@ -144,7 +144,7 @@ static int dv_decode_video_segment(AVCodecContext *avctx, void *arg)

     LOCAL_ALIGNED_16(DCTELEM, sblock, [5*DV_MAX_BPM], [64]);

     LOCAL_ALIGNED_16(uint8_t, mb_bit_buffer, [  80 + FF_INPUT_BUFFER_PADDING_SIZE]); /* allow some slack */

     LOCAL_ALIGNED_16(uint8_t, vs_bit_buffer, [5*80 + FF_INPUT_BUFFER_PADDING_SIZE]); /* allow some slack */

-    const int log2_blocksize = 3-s->avctx->lowres;

+    const int log2_blocksize = 3;

     int is_field_mode[5];

     assert((((int)mb_bit_buffer) & 7) == 0);

@@ -382,6 +382,5 @@ AVCodec ff_dvvideo_decoder = {

     .close          = dvvideo_close,

     .decode         = dvvideo_decode_frame,

     .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,

-    .max_lowres     = 3,

     .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),

 };

@@ -907,7 +907,7 @@ void ff_er_frame_end(MpegEncContext *s)

     /* We do not support ER of field pictures yet,

      * though it should not crash if enabled. */

-    if (!s->err_recognition || s->error_count == 0 || s->avctx->lowres ||

+    if (!s->err_recognition || s->error_count == 0                     ||

         s->avctx->hwaccel                                              ||

         s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU          ||

         s->picture_structure != PICT_FRAME                             ||

@@ -127,7 +127,6 @@ AVCodec ff_flv_decoder = {

     .close          = ff_h263_decode_end,

     .decode         = ff_h263_decode_frame,

     .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,

-    .max_lowres     = 3,

     .long_name      = NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"),

     .pix_fmts       = ff_pixfmt_list_420,

 };

@@ -658,6 +658,5 @@ AVCodec ff_h261_decoder = {

     .close          = h261_decode_end,

     .decode         = h261_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .max_lowres     = 3,

     .long_name      = NULL_IF_CONFIG_SMALL("H.261"),

 };

@@ -151,7 +151,7 @@ static int get_consumed_bytes(MpegEncContext *s, int buf_size){

 static int decode_slice(MpegEncContext *s){

     const int part_mask= s->partitioned_frame ? (ER_AC_END|ER_AC_ERROR) : 0x7F;

-    const int mb_size= 16>>s->avctx->lowres;

+    const int mb_size = 16;

     s->last_resync_gb= s->gb;

     s->first_slice_line= 1;

@@ -764,7 +764,6 @@ AVCodec ff_h263_decoder = {

     .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |

                       CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,

     .flush          = ff_mpeg_flush,

-    .max_lowres     = 3,

     .long_name      = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),

     .pix_fmts       = ff_hwaccel_pixfmt_list_420,

 };

@@ -716,7 +716,6 @@ av_cold void ff_intrax8_common_end(IntraX8Context * w)

  * The parent codec must call MPV_frame_start(), ff_er_frame_start() before calling this function.

  * The parent codec must call ff_er_frame_end(), MPV_frame_end() after calling this function.

  * This function does not use MPV_decode_mb().

- * lowres decoding is theoretically impossible.

  * @param w pointer to IntraX8Context

  * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1.

  * @param quant_offset offset away from zero

@@ -940,216 +940,3 @@ void ff_j_rev_dct(DCTBLOCK data)

     dataptr++;                  /* advance pointer to next column */

   }

 }

-

-#undef DCTSIZE

-#define DCTSIZE 4

-#define DCTSTRIDE 8

-

-void ff_j_rev_dct4(DCTBLOCK data)

-{

-  int32_t tmp0, tmp1, tmp2, tmp3;

-  int32_t tmp10, tmp11, tmp12, tmp13;

-  int32_t z1;

-  int32_t d0, d2, d4, d6;

-  register DCTELEM *dataptr;

-  int rowctr;

-

-  /* Pass 1: process rows. */

-  /* Note results are scaled up by sqrt(8) compared to a true IDCT; */

-  /* furthermore, we scale the results by 2**PASS1_BITS. */

-

-  data[0] += 4;

-

-  dataptr = data;

-

-  for (rowctr = DCTSIZE-1; rowctr >= 0; rowctr--) {

-    /* Due to quantization, we will usually find that many of the input

-     * coefficients are zero, especially the AC terms.  We can exploit this

-     * by short-circuiting the IDCT calculation for any row in which all

-     * the AC terms are zero.  In that case each output is equal to the

-     * DC coefficient (with scale factor as needed).

-     * With typical images and quantization tables, half or more of the

-     * row DCT calculations can be simplified this way.

-     */

-

-    register int *idataptr = (int*)dataptr;

-

-    d0 = dataptr[0];

-    d2 = dataptr[1];

-    d4 = dataptr[2];

-    d6 = dataptr[3];

-

-    if ((d2 | d4 | d6) == 0) {

-      /* AC terms all zero */

-      if (d0) {

-          /* Compute a 32 bit value to assign. */

-          DCTELEM dcval = (DCTELEM) (d0 << PASS1_BITS);

-          register int v = (dcval & 0xffff) | ((dcval << 16) & 0xffff0000);

-

-          idataptr[0] = v;

-          idataptr[1] = v;

-      }

-

-      dataptr += DCTSTRIDE;     /* advance pointer to next row */

-      continue;

-    }

-

-    /* Even part: reverse the even part of the forward DCT. */

-    /* The rotator is sqrt(2)*c(-6). */

-    if (d6) {

-            if (d2) {

-                    /* d0 != 0, d2 != 0, d4 != 0, d6 != 0 */

-                    z1 = MULTIPLY(d2 + d6, FIX_0_541196100);

-                    tmp2 = z1 + MULTIPLY(-d6, FIX_1_847759065);

-                    tmp3 = z1 + MULTIPLY(d2, FIX_0_765366865);

-

-                    tmp0 = (d0 + d4) << CONST_BITS;

-                    tmp1 = (d0 - d4) << CONST_BITS;

-

-                    tmp10 = tmp0 + tmp3;

-                    tmp13 = tmp0 - tmp3;

-                    tmp11 = tmp1 + tmp2;

-                    tmp12 = tmp1 - tmp2;

-            } else {

-                    /* d0 != 0, d2 == 0, d4 != 0, d6 != 0 */

-                    tmp2 = MULTIPLY(-d6, FIX_1_306562965);

-                    tmp3 = MULTIPLY(d6, FIX_0_541196100);

-

-                    tmp0 = (d0 + d4) << CONST_BITS;

-                    tmp1 = (d0 - d4) << CONST_BITS;

-

-                    tmp10 = tmp0 + tmp3;

-                    tmp13 = tmp0 - tmp3;

-                    tmp11 = tmp1 + tmp2;

-                    tmp12 = tmp1 - tmp2;

-            }

-    } else {

-            if (d2) {

-                    /* d0 != 0, d2 != 0, d4 != 0, d6 == 0 */

-                    tmp2 = MULTIPLY(d2, FIX_0_541196100);

-                    tmp3 = MULTIPLY(d2, FIX_1_306562965);

-

-                    tmp0 = (d0 + d4) << CONST_BITS;

-                    tmp1 = (d0 - d4) << CONST_BITS;

-

-                    tmp10 = tmp0 + tmp3;

-                    tmp13 = tmp0 - tmp3;

-                    tmp11 = tmp1 + tmp2;

-                    tmp12 = tmp1 - tmp2;

-            } else {

-                    /* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */

-                    tmp10 = tmp13 = (d0 + d4) << CONST_BITS;

-                    tmp11 = tmp12 = (d0 - d4) << CONST_BITS;

-            }

-      }

-

-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */

-

-    dataptr[0] = (DCTELEM) DESCALE(tmp10, CONST_BITS-PASS1_BITS);

-    dataptr[1] = (DCTELEM) DESCALE(tmp11, CONST_BITS-PASS1_BITS);

-    dataptr[2] = (DCTELEM) DESCALE(tmp12, CONST_BITS-PASS1_BITS);

-    dataptr[3] = (DCTELEM) DESCALE(tmp13, CONST_BITS-PASS1_BITS);

-

-    dataptr += DCTSTRIDE;       /* advance pointer to next row */

-  }

-

-  /* Pass 2: process columns. */

-  /* Note that we must descale the results by a factor of 8 == 2**3, */

-  /* and also undo the PASS1_BITS scaling. */

-

-  dataptr = data;

-  for (rowctr = DCTSIZE-1; rowctr >= 0; rowctr--) {

-    /* Columns of zeroes can be exploited in the same way as we did with rows.

-     * However, the row calculation has created many nonzero AC terms, so the

-     * simplification applies less often (typically 5% to 10% of the time).

-     * On machines with very fast multiplication, it's possible that the

-     * test takes more time than it's worth.  In that case this section

-     * may be commented out.

-     */

-

-    d0 = dataptr[DCTSTRIDE*0];

-    d2 = dataptr[DCTSTRIDE*1];

-    d4 = dataptr[DCTSTRIDE*2];

-    d6 = dataptr[DCTSTRIDE*3];

-

-    /* Even part: reverse the even part of the forward DCT. */

-    /* The rotator is sqrt(2)*c(-6). */

-    if (d6) {

-            if (d2) {

-                    /* d0 != 0, d2 != 0, d4 != 0, d6 != 0 */

-                    z1 = MULTIPLY(d2 + d6, FIX_0_541196100);

-                    tmp2 = z1 + MULTIPLY(-d6, FIX_1_847759065);

-                    tmp3 = z1 + MULTIPLY(d2, FIX_0_765366865);

-

-                    tmp0 = (d0 + d4) << CONST_BITS;

-                    tmp1 = (d0 - d4) << CONST_BITS;

-

-                    tmp10 = tmp0 + tmp3;

-                    tmp13 = tmp0 - tmp3;

-                    tmp11 = tmp1 + tmp2;

-                    tmp12 = tmp1 - tmp2;

-            } else {

-                    /* d0 != 0, d2 == 0, d4 != 0, d6 != 0 */

-                    tmp2 = MULTIPLY(-d6, FIX_1_306562965);

-                    tmp3 = MULTIPLY(d6, FIX_0_541196100);

-

-                    tmp0 = (d0 + d4) << CONST_BITS;

-                    tmp1 = (d0 - d4) << CONST_BITS;

-

-                    tmp10 = tmp0 + tmp3;

-                    tmp13 = tmp0 - tmp3;