@@ -5,6 +5,7 @@ version next:

 - v408 Quicktime and Microsoft AYUV Uncompressed 4:4:4:4 encoder and decoder

 - setfield filter

 - CDXL demuxer and decoder

+- Apple ProRes encoder

 version 0.10:

@@ -925,7 +925,7 @@ static av_cold void common_init(AVCodecContext *avctx)

 {

     FourXContext * const f = avctx->priv_data;

-    dsputil_init(&f->dsp, avctx);

+    ff_dsputil_init(&f->dsp, avctx);

     f->avctx = avctx;

 }

@@ -969,7 +969,7 @@ static av_cold int decode_end(AVCodecContext *avctx)

         av_freep(&f->cfrm[i].data);

         f->cfrm[i].allocated_size = 0;

     }

-    free_vlc(&f->pre_vlc);

+    ff_free_vlc(&f->pre_vlc);

     if (f->current_picture.data[0])

         avctx->release_buffer(avctx, &f->current_picture);

     if (f->last_picture.data[0])

@@ -333,6 +333,7 @@ OBJS-$(CONFIG_PRORES_DECODER)          += proresdec2.o

 OBJS-$(CONFIG_PRORES_LGPL_DECODER)     += proresdec_lgpl.o proresdsp.o

 OBJS-$(CONFIG_PRORES_ENCODER)          += proresenc_anatoliy.o

 OBJS-$(CONFIG_PRORES_ANATOLIY_ENCODER) += proresenc_anatoliy.o

+OBJS-$(CONFIG_PRORES_KOSTYA_ENCODER)   += proresenc_kostya.o proresdata.o proresdsp.o

 OBJS-$(CONFIG_PTX_DECODER)             += ptx.o

 OBJS-$(CONFIG_QCELP_DECODER)           += qcelpdec.o celp_math.o         \

                                           celp_filters.o acelp_vectors.o \

@@ -825,7 +825,7 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)

     ff_aac_sbr_init();

-    dsputil_init(&ac->dsp, avctx);

+    ff_dsputil_init(&ac->dsp, avctx);

     ff_fmt_convert_init(&ac->fmt_conv, avctx);

     ac->random_state = 0x1f2e3d4c;

@@ -669,7 +669,7 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s)

 {

     int ret = 0;

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     // window init

     ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024);

@@ -167,7 +167,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)

     ff_mdct_init(&s->imdct_256, 8, 1, 1.0);

     ff_mdct_init(&s->imdct_512, 9, 1, 1.0);

     ff_kbd_window_init(s->window, 5.0, 256);

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT);

     ff_fmt_convert_init(&s->fmt_conv, avctx);

     av_lfg_init(&s->dith_state, 0);

@@ -2467,7 +2467,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)

     if (!avctx->coded_frame)

         goto init_fail;

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT);

     dprint_options(s);

@@ -182,6 +182,7 @@ void avcodec_register_all(void)

     REGISTER_ENCDEC  (PPM, ppm);

     REGISTER_ENCDEC  (PRORES, prores);

     REGISTER_ENCODER (PRORES_ANATOLIY, prores_anatoliy);

+    REGISTER_ENCODER (PRORES_KOSTYA, prores_kostya);

     REGISTER_DECODER (PRORES_LGPL, prores_lgpl);

     REGISTER_DECODER (PTX, ptx);

     REGISTER_DECODER (QDRAW, qdraw);

@@ -268,7 +268,7 @@ static void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels,

     put_pixels_axp_asm(block + 8, pixels + 8, line_size, h);

 }

-void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx)

+void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx)

 {

     const int high_bit_depth = avctx->bits_per_raw_sample > 8;

@@ -103,7 +103,7 @@ static void dct_unquantize_h263_inter_axp(MpegEncContext *s, DCTELEM *block,

     dct_unquantize_h263_axp(block, n_coeffs, qscale, (qscale - 1) | 1);

 }

-void MPV_common_init_axp(MpegEncContext *s)

+void ff_MPV_common_init_axp(MpegEncContext *s)

 {

     s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_axp;

     s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_axp;

@@ -1724,7 +1724,7 @@ static av_cold int decode_init(AVCodecContext *avctx)

         }

     }

-    dsputil_init(&ctx->dsp, avctx);

+    ff_dsputil_init(&ctx->dsp, avctx);

     avcodec_get_frame_defaults(&ctx->frame);

     avctx->coded_frame = &ctx->frame;

@@ -231,7 +231,7 @@ static av_cold int ape_decode_init(AVCodecContext *avctx)

                          filter_alloc_fail);

     }

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;

     avcodec_get_frame_defaults(&s->frame);

@@ -73,7 +73,7 @@ static void simple_idct_arm_add(uint8_t *dest, int line_size, DCTELEM *block)

     ff_add_pixels_clamped(block, dest, line_size);

 }

-void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)

+void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)

 {

     const int high_bit_depth = avctx->bits_per_raw_sample > 8;

@@ -38,17 +38,17 @@ void ff_dct_unquantize_h263_inter_neon(MpegEncContext *s, DCTELEM *block,

 void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, DCTELEM *block,

                                        int n, int qscale);

-void MPV_common_init_arm(MpegEncContext *s)

+void ff_MPV_common_init_arm(MpegEncContext *s)

 {

     /* IWMMXT support is a superset of armv5te, so

      * allow optimized functions for armv5te unless

      * a better iwmmxt function exists

      */

 #if HAVE_ARMV5TE

-    MPV_common_init_armv5te(s);

+    ff_MPV_common_init_armv5te(s);

 #endif

 #if HAVE_IWMMXT

-    MPV_common_init_iwmmxt(s);

+    ff_MPV_common_init_iwmmxt(s);

 #endif

     if (HAVE_NEON) {

@@ -21,7 +21,7 @@

 #include "libavcodec/mpegvideo.h"

-void MPV_common_init_iwmmxt(MpegEncContext *s);

-void MPV_common_init_armv5te(MpegEncContext *s);

+void ff_MPV_common_init_iwmmxt(MpegEncContext *s);

+void ff_MPV_common_init_armv5te(MpegEncContext *s);

 #endif /* AVCODEC_ARM_MPEGVIDEO_H */

@@ -94,7 +94,7 @@ static void dct_unquantize_h263_inter_armv5te(MpegEncContext *s,

     ff_dct_unquantize_h263_armv5te(block, qmul, qadd, nCoeffs + 1);

 }

-void MPV_common_init_armv5te(MpegEncContext *s)

+void ff_MPV_common_init_armv5te(MpegEncContext *s)

 {

     s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_armv5te;

     s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_armv5te;

@@ -93,7 +93,7 @@ static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,

     block_orig[0] = level;

 }

-void MPV_common_init_iwmmxt(MpegEncContext *s)

+void ff_MPV_common_init_iwmmxt(MpegEncContext *s)

 {

     if (!(mm_flags & AV_CPU_FLAG_IWMMXT)) return;

@@ -519,7 +519,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,

 static av_cold void common_init(AVCodecContext *avctx){

     ASV1Context * const a = avctx->priv_data;

-    dsputil_init(&a->dsp, avctx);

+    ff_dsputil_init(&a->dsp, avctx);

     a->mb_width   = (avctx->width  + 15) / 16;

     a->mb_height  = (avctx->height + 15) / 16;

@@ -48,7 +48,7 @@ static const float qmf_48tap_half[24] = {

  * Generate common tables

  */

-void atrac_generate_tables(void)

+void ff_atrac_generate_tables(void)

 {

     int i;

     float s;

@@ -79,7 +79,7 @@ void atrac_generate_tables(void)

  */

-void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp)

+void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp)

 {

     int   i, j;

     float   *p1, *p3;

@@ -30,7 +30,7 @@

 extern float ff_atrac_sf_table[64];

-void atrac_generate_tables(void);

-void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp);

+void ff_atrac_generate_tables(void);

+void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp);

 #endif /* AVCODEC_ATRAC_H */

@@ -262,14 +262,14 @@ static void at1_subband_synthesis(AT1Ctx *q, AT1SUCtx* su, float *pOut)

     float iqmf_temp[512 + 46];

     /* combine low and middle bands */

-    atrac_iqmf(q->bands[0], q->bands[1], 128, temp, su->fst_qmf_delay, iqmf_temp);

+    ff_atrac_iqmf(q->bands[0], q->bands[1], 128, temp, su->fst_qmf_delay, iqmf_temp);

     /* delay the signal of the high band by 23 samples */

     memcpy( su->last_qmf_delay,    &su->last_qmf_delay[256], sizeof(float) *  23);

     memcpy(&su->last_qmf_delay[23], q->bands[2],             sizeof(float) * 256);

     /* combine (low + middle) and high bands */

-    atrac_iqmf(temp, su->last_qmf_delay, 256, pOut, su->snd_qmf_delay, iqmf_temp);

+    ff_atrac_iqmf(temp, su->last_qmf_delay, 256, pOut, su->snd_qmf_delay, iqmf_temp);

 }

@@ -378,9 +378,9 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)

     ff_init_ff_sine_windows(5);

-    atrac_generate_tables();

+    ff_atrac_generate_tables();

-    dsputil_init(&q->dsp, avctx);

+    ff_dsputil_init(&q->dsp, avctx);

     ff_fmt_convert_init(&q->fmt_conv, avctx);

     q->bands[0] = q->low;

@@ -814,9 +814,9 @@ static int decodeFrame(ATRAC3Context *q, const uint8_t* databuf,

         p2= p1+256;

         p3= p2+256;

         p4= p3+256;

-        atrac_iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf);

-        atrac_iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf);

-        atrac_iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf);

+        ff_atrac_iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf);

+        ff_atrac_iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf);

+        ff_atrac_iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf);

     }

     return 0;

@@ -1016,7 +1016,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)

         return ret;

     }

-    atrac_generate_tables();

+    ff_atrac_generate_tables();

     /* Generate gain tables. */

     for (i=0 ; i<16 ; i++)

@@ -1039,7 +1039,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)

         q->matrix_coeff_index_next[i] = 3;

     }

-    dsputil_init(&dsp, avctx);

+    ff_dsputil_init(&dsp, avctx);

     ff_fmt_convert_init(&q->fmt_conv, avctx);

     q->pUnits = av_mallocz(sizeof(channel_unit)*q->channels);

@@ -195,7 +195,7 @@ static int bfin_pix_abs8_xy2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_si

 */

-void dsputil_init_bfin( DSPContext* c, AVCodecContext *avctx )

+void ff_dsputil_init_bfin( DSPContext* c, AVCodecContext *avctx )

 {

     const int high_bit_depth = avctx->bits_per_raw_sample > 8;

@@ -146,7 +146,7 @@ static int dct_quantize_bfin (MpegEncContext *s,

     return last_non_zero;

 }

-void MPV_common_init_bfin (MpegEncContext *s)

+void ff_MPV_common_init_bfin (MpegEncContext *s)

 {

 /*     s->dct_quantize= dct_quantize_bfin; */

 }

@@ -1298,7 +1298,7 @@ static av_cold int decode_init(AVCodecContext *avctx)

     avctx->pix_fmt = c->has_alpha ? PIX_FMT_YUVA420P : PIX_FMT_YUV420P;

     avctx->idct_algo = FF_IDCT_BINK;

-    dsputil_init(&c->dsp, avctx);

+    ff_dsputil_init(&c->dsp, avctx);

     ff_binkdsp_init(&c->bdsp);

     init_bundles(c);

@@ -79,7 +79,7 @@ static av_cold int decode_init(AVCodecContext *avctx)

     int i;

     int frame_len_bits;

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     ff_fmt_convert_init(&s->fmt_conv, avctx);

     /* determine frame length */

@@ -253,9 +253,9 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,

    (byte/word/long) to store the 'bits', 'codes', and 'symbols' tables.

    'use_static' should be set to 1 for tables, which should be freed

-   with av_free_static(), 0 if free_vlc() will be used.

+   with av_free_static(), 0 if ff_free_vlc() will be used.

 */

-int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,

+int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,

              const void *bits, int bits_wrap, int bits_size,

              const void *codes, int codes_wrap, int codes_size,

              const void *symbols, int symbols_wrap, int symbols_size,

@@ -318,7 +318,7 @@ int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,

 }

-void free_vlc(VLC *vlc)

+void ff_free_vlc(VLC *vlc)

 {

     av_freep(&vlc->table);

 }

@@ -671,7 +671,7 @@ av_cold int ff_cavs_init(AVCodecContext *avctx) {

     AVSContext *h = avctx->priv_data;

     MpegEncContext * const s = &h->s;

-    MPV_decode_defaults(s);

+    ff_MPV_decode_defaults(s);

     ff_cavsdsp_init(&h->cdsp, avctx);

     s->avctx = avctx;

@@ -470,7 +470,7 @@ static int decode_pic(AVSContext *h) {

     if (!s->context_initialized) {

         s->avctx->idct_algo = FF_IDCT_CAVS;

-        if (MPV_common_init(s) < 0)

+        if (ff_MPV_common_init(s) < 0)

             return -1;

         ff_init_scantable(s->dsp.idct_permutation,&h->scantable,ff_zigzag_direct);

     }

@@ -321,11 +321,11 @@ static av_cold int cook_decode_close(AVCodecContext *avctx)

     /* Free the VLC tables. */

     for (i = 0; i < 13; i++)

-        free_vlc(&q->envelope_quant_index[i]);

+        ff_free_vlc(&q->envelope_quant_index[i]);

     for (i = 0; i < 7; i++)

-        free_vlc(&q->sqvh[i]);

+        ff_free_vlc(&q->sqvh[i]);

     for (i = 0; i < q->num_subpackets; i++)

-        free_vlc(&q->subpacket[i].ccpl);

+        ff_free_vlc(&q->subpacket[i].ccpl);

     av_log(avctx, AV_LOG_DEBUG, "Memory deallocated.\n");

@@ -1926,7 +1926,7 @@ static av_cold int dca_decode_init(AVCodecContext *avctx)

     s->avctx = avctx;

     dca_init_vlcs();

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     ff_mdct_init(&s->imdct, 6, 1, 1.0);

     ff_synth_filter_init(&s->synth);

     ff_dcadsp_init(&s->dcadsp);

@@ -85,7 +85,7 @@ static int cpu_flags;

 static const struct algo fdct_tab[] = {

     { "REF-DBL",        ff_ref_fdct,           NO_PERM    },

     { "FAAN",           ff_faandct,            FAAN_SCALE },

-    { "IJG-AAN-INT",    fdct_ifast,            SCALE_PERM },

+    { "IJG-AAN-INT",    ff_fdct_ifast,         SCALE_PERM },

     { "IJG-LLM-INT",    ff_jpeg_fdct_islow_8,  NO_PERM    },

 #if HAVE_MMX

@@ -124,7 +124,7 @@ static void ff_prores_idct_put_10_sse2_wrap(uint16_t *dst){

 static const struct algo idct_tab[] = {

     { "FAANI",          ff_faanidct,           NO_PERM  },

     { "REF-DBL",        ff_ref_idct,           NO_PERM  },

-    { "INT",            j_rev_dct,             MMX_PERM },

+    { "INT",            ff_j_rev_dct,          MMX_PERM },

     { "SIMPLE-C",       ff_simple_idct_8,      NO_PERM  },

 #if HAVE_MMX

@@ -84,9 +84,9 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, int cid)

         }

         ctx->cid_table = &ff_dnxhd_cid_table[index];

-        free_vlc(&ctx->ac_vlc);

-        free_vlc(&ctx->dc_vlc);

-        free_vlc(&ctx->run_vlc);

+        ff_free_vlc(&ctx->ac_vlc);

+        ff_free_vlc(&ctx->dc_vlc);

+        ff_free_vlc(&ctx->run_vlc);

         init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257,

                  ctx->cid_table->ac_bits, 1, 1,

@@ -132,7 +132,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_si

         ctx->avctx->pix_fmt = PIX_FMT_YUV422P10;

         ctx->avctx->bits_per_raw_sample = 10;

         if (ctx->bit_depth != 10) {

-            dsputil_init(&ctx->dsp, ctx->avctx);

+            ff_dsputil_init(&ctx->dsp, ctx->avctx);

             ctx->bit_depth = 10;

             ctx->decode_dct_block = dnxhd_decode_dct_block_10;

         }

@@ -140,7 +140,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_si

         ctx->avctx->pix_fmt = PIX_FMT_YUV422P;

         ctx->avctx->bits_per_raw_sample = 8;

         if (ctx->bit_depth != 8) {

-            dsputil_init(&ctx->dsp, ctx->avctx);

+            ff_dsputil_init(&ctx->dsp, ctx->avctx);

             ctx->bit_depth = 8;

             ctx->decode_dct_block = dnxhd_decode_dct_block_8;

         }

@@ -414,9 +414,9 @@ static av_cold int dnxhd_decode_close(AVCodecContext *avctx)

     if (ctx->picture.data[0])

         ff_thread_release_buffer(avctx, &ctx->picture);

-    free_vlc(&ctx->ac_vlc);

-    free_vlc(&ctx->dc_vlc);

-    free_vlc(&ctx->run_vlc);

+    ff_free_vlc(&ctx->ac_vlc);

+    ff_free_vlc(&ctx->dc_vlc);

+    ff_free_vlc(&ctx->run_vlc);

     return 0;

 }

@@ -267,10 +267,10 @@ static int dnxhd_encode_init(AVCodecContext *avctx)

     avctx->bits_per_raw_sample = ctx->cid_table->bit_depth;

-    dsputil_init(&ctx->m.dsp, avctx);

+    ff_dsputil_init(&ctx->m.dsp, avctx);

     ff_dct_common_init(&ctx->m);

     if (!ctx->m.dct_quantize)

-        ctx->m.dct_quantize = dct_quantize_c;

+        ctx->m.dct_quantize = ff_dct_quantize_c;

     if (ctx->cid_table->bit_depth == 10) {

        ctx->m.dct_quantize = dnxhd_10bit_dct_quantize;

@@ -83,7 +83,7 @@ const uint8_t ff_zigzag248_direct[64] = {

 };

 /* not permutated inverse zigzag_direct + 1 for MMX quantizer */

-DECLARE_ALIGNED(16, uint16_t, inv_zigzag_direct16)[64];

+DECLARE_ALIGNED(16, uint16_t, ff_inv_zigzag_direct16)[64];

 const uint8_t ff_alternate_horizontal_scan[64] = {

     0,  1,   2,  3,  8,  9, 16, 17,

@@ -2746,34 +2746,34 @@ static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block)

 }

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

 {

-    j_rev_dct (block);

+    ff_j_rev_dct (block);

     ff_put_pixels_clamped_c(block, dest, line_size);

 }

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

 {

-    j_rev_dct (block);

+    ff_j_rev_dct (block);

     ff_add_pixels_clamped_c(block, dest, line_size);

 }

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

 {

-    j_rev_dct4 (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)

 {

-    j_rev_dct4 (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)

 {

-    j_rev_dct2 (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)

 {

-    j_rev_dct2 (block);

+    ff_j_rev_dct2 (block);

     add_pixels_clamped2_c(block, dest, line_size);

 }

@@ -2793,7 +2793,7 @@ static void ff_jref_idct1_add(uint8_t *dest, int line_size, DCTELEM *block)

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

 /* init static data */

-av_cold void dsputil_static_init(void)

+av_cold void ff_dsputil_static_init(void)

 {

     int i;

@@ -2807,7 +2807,7 @@ av_cold void dsputil_static_init(void)

         ff_squareTbl[i] = (i - 256) * (i - 256);

     }

-    for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;

+    for(i=0; i<64; i++) ff_inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;

 }

 int ff_check_alignment(void){

@@ -2830,7 +2830,7 @@ int ff_check_alignment(void){

     return 0;

 }

-av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

+av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)

 {

     int i;

@@ -2842,8 +2842,8 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

         c->fdct248 = ff_fdct248_islow_10;

     } else {

         if(avctx->dct_algo==FF_DCT_FASTINT) {

-            c->fdct    = fdct_ifast;

-            c->fdct248 = fdct_ifast248;

+            c->fdct    = ff_fdct_ifast;

+            c->fdct248 = ff_fdct_ifast248;

         }

         else if(avctx->dct_algo==FF_DCT_FAAN) {

             c->fdct    = ff_faandct;

@@ -2859,17 +2859,17 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

     if(avctx->lowres==1){

         c->idct_put= ff_jref_idct4_put;

         c->idct_add= ff_jref_idct4_add;

-        c->idct    = j_rev_dct4;

+        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    = j_rev_dct2;

+        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    = j_rev_dct1;

+        c->idct    = ff_j_rev_dct1;

         c->idct_permutation_type= FF_NO_IDCT_PERM;

     }else{

         if (avctx->bits_per_raw_sample == 10) {

@@ -2881,7 +2881,7 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

         if(avctx->idct_algo==FF_IDCT_INT){

             c->idct_put= ff_jref_idct_put;

             c->idct_add= ff_jref_idct_add;

-            c->idct    = j_rev_dct;

+            c->idct    = ff_j_rev_dct;

             c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;

         }else if((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER ) &&

                 avctx->idct_algo==FF_IDCT_VP3){

@@ -3062,7 +3062,7 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

     c->add_8x8basis= add_8x8basis_c;

 #if CONFIG_VORBIS_DECODER

-    c->vorbis_inverse_coupling = vorbis_inverse_coupling;

+    c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling;

 #endif

 #if CONFIG_AC3_DECODER

     c->ac3_downmix = ff_ac3_downmix_c;

@@ -3182,14 +3182,14 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

     }

-    if (HAVE_MMX)        dsputil_init_mmx   (c, avctx);

-    if (ARCH_ARM)        dsputil_init_arm   (c, avctx);

-    if (HAVE_VIS)        dsputil_init_vis   (c, avctx);

-    if (ARCH_ALPHA)      dsputil_init_alpha (c, avctx);

-    if (ARCH_PPC)        dsputil_init_ppc   (c, avctx);

-    if (HAVE_MMI)        dsputil_init_mmi   (c, avctx);

-    if (ARCH_SH4)        dsputil_init_sh4   (c, avctx);

-    if (ARCH_BFIN)       dsputil_init_bfin  (c, avctx);

+    if (HAVE_MMX)        ff_dsputil_init_mmx   (c, avctx);

+    if (ARCH_ARM)        ff_dsputil_init_arm   (c, avctx);

+    if (HAVE_VIS)        ff_dsputil_init_vis   (c, avctx);

+    if (ARCH_ALPHA)      ff_dsputil_init_alpha (c, avctx);

+    if (ARCH_PPC)        ff_dsputil_init_ppc   (c, avctx);

+    if (HAVE_MMI)        ff_dsputil_init_mmi   (c, avctx);

+    if (ARCH_SH4)        ff_dsputil_init_sh4   (c, avctx);

+    if (ARCH_BFIN)       ff_dsputil_init_bfin  (c, avctx);

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

         if(!c->put_2tap_qpel_pixels_tab[0][i])

@@ -3201,3 +3201,8 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

     ff_init_scantable_permutation(c->idct_permutation,

                                   c->idct_permutation_type);

 }

+

+av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

+{

+    ff_dsputil_init(c, avctx);

+}

@@ -38,17 +38,17 @@

 /* dct code */

 typedef short DCTELEM;

-void fdct_ifast (DCTELEM *data);

-void fdct_ifast248 (DCTELEM *data);

+void ff_fdct_ifast (DCTELEM *data);

+void ff_fdct_ifast248 (DCTELEM *data);

 void ff_jpeg_fdct_islow_8(DCTELEM *data);

 void ff_jpeg_fdct_islow_10(DCTELEM *data);

 void ff_fdct248_islow_8(DCTELEM *data);

 void ff_fdct248_islow_10(DCTELEM *data);

-void j_rev_dct (DCTELEM *data);

-void j_rev_dct4 (DCTELEM *data);

-void j_rev_dct2 (DCTELEM *data);

-void j_rev_dct1 (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);

@@ -581,8 +581,9 @@ typedef struct DSPContext {

     op_fill_func fill_block_tab[2];

 } DSPContext;

-void dsputil_static_init(void);

-void dsputil_init(DSPContext* p, AVCodecContext *avctx);

+void ff_dsputil_static_init(void);

+void ff_dsputil_init(DSPContext* p, AVCodecContext *avctx);

+attribute_deprecated void dsputil_init(DSPContext* c, AVCodecContext *avctx);

 int ff_check_alignment(void);

@@ -641,14 +642,14 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){

     }

 }

-void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx);

-void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx);

-void dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx);

-void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx);

-void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx);

-void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);

-void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);

-void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);

+void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx);

+void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx);

+void ff_dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx);

+void ff_dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx);

+void ff_dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx);

+void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);

+void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);

+void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);

 void ff_dsputil_init_dwt(DSPContext *c);

 void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx);

@@ -313,13 +313,13 @@ static av_cold int dvvideo_init(AVCodecContext *avctx)

             dv_rl_vlc[i].level = level;

             dv_rl_vlc[i].run   = run;

         }

-        free_vlc(&dv_vlc);

+        ff_free_vlc(&dv_vlc);

         dv_vlc_map_tableinit();

     }

     /* Generic DSP setup */

-    dsputil_init(&dsp, avctx);

+    ff_dsputil_init(&dsp, avctx);

     ff_set_cmp(&dsp, dsp.ildct_cmp, avctx->ildct_cmp);

     s->get_pixels = dsp.get_pixels;

     s->ildct_cmp = dsp.ildct_cmp[5];

@@ -65,7 +65,7 @@ static av_cold int decode_init(AVCodecContext *avctx)

     avctx->pix_fmt = PIX_FMT_YUV420P;

     if (avctx->idct_algo == FF_IDCT_AUTO)

         avctx->idct_algo = FF_IDCT_EA;

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct);

     ff_mpeg12_init_vlcs();

     return 0;

@@ -50,7 +50,7 @@ static av_cold int tgq_decode_init(AVCodecContext *avctx){

     s->avctx = avctx;

     if(avctx->idct_algo==FF_IDCT_AUTO)

         avctx->idct_algo=FF_IDCT_EA;

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);

     avctx->time_base = (AVRational){1, 15};

     avctx->pix_fmt = PIX_FMT_YUV420P;

@@ -48,7 +48,7 @@ static av_cold int tqi_decode_init(AVCodecContext *avctx)

     s->avctx = avctx;

     if(avctx->idct_algo==FF_IDCT_AUTO)

         avctx->idct_algo=FF_IDCT_EA;

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct);

     s->qscale = 1;

     avctx->time_base = (AVRational){1, 15};

@@ -69,7 +69,7 @@ static void decode_mb(MpegEncContext *s, int ref)

         ff_h264_hl_decode_mb(h);

     } else {

         assert(ref == 0);

-        MPV_decode_mb(s, s->block);

+        ff_MPV_decode_mb(s, s->block);

     }

 }

@@ -110,11 +110,11 @@ av_cold void ff_ccitt_unpack_init(void)

     ccitt_vlc[1].table = code_table2;

     ccitt_vlc[1].table_allocated = 648;

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

-        init_vlc_sparse(&ccitt_vlc[i], 9, CCITT_SYMS,

-                        ccitt_codes_lens[i], 1, 1,

-                        ccitt_codes_bits[i], 1, 1,

-                        ccitt_syms, 2, 2,

-                        INIT_VLC_USE_NEW_STATIC);

+        ff_init_vlc_sparse(&ccitt_vlc[i], 9, CCITT_SYMS,

+                           ccitt_codes_lens[i], 1, 1,

+                           ccitt_codes_bits[i], 1, 1,

+                           ccitt_syms, 2, 2,

+                           INIT_VLC_USE_NEW_STATIC);

     }

     INIT_VLC_STATIC(&ccitt_group3_2d_vlc, 9, 11,

                     ccitt_group3_2d_lens, 1, 1,

@@ -674,7 +674,7 @@ static av_cold int common_init(AVCodecContext *avctx){

     avcodec_get_frame_defaults(&s->picture);

-    dsputil_init(&s->dsp, avctx);

+    ff_dsputil_init(&s->dsp, avctx);

     s->width = avctx->width;

     s->height= avctx->height;

@@ -89,9 +89,9 @@ AVCodec ff_flv_encoder = {

     .type           = AVMEDIA_TYPE_VIDEO,

     .id             = CODEC_ID_FLV1,

     .priv_data_size = sizeof(MpegEncContext),

-    .init           = MPV_encode_init,

-    .encode         = MPV_encode_picture,

-    .close          = MPV_encode_end,

+    .init           = ff_MPV_encode_init,

+    .encode         = ff_MPV_encode_picture,

+    .close          = ff_MPV_encode_end,

     .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},

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

 };