diff options
author | Martin Storsjö <martin@martin.st> | 2012-02-15 14:10:33 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:07:23 +0200 |
commit | efd29844eb84ca5e1b05292300054ea12b02d1e5 (patch) | |
tree | 0d10e3ec6b1c73df4ed62f1bbd00546baf11df4c /libavcodec/mpeg12.c | |
parent | 0ca1bdb37d3597f67b8547c262aaa5b82d4e563e (diff) | |
download | ffmpeg-efd29844eb84ca5e1b05292300054ea12b02d1e5.tar.gz |
mpegvideo: Add ff_ prefix to nonstatic functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index da4dd2c170..4b526eb6ef 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1117,7 +1117,7 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) for (i = 0; i < 64; i++) s2->dsp.idct_permutation[i]=i; - MPV_decode_defaults(s2); + ff_MPV_decode_defaults(s2); s->mpeg_enc_ctx.avctx = avctx; s->mpeg_enc_ctx.flags = avctx->flags; @@ -1219,7 +1219,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (s1->mpeg_enc_ctx_allocated) { ParseContext pc = s->parse_context; s->parse_context.buffer = 0; - MPV_common_end(s); + ff_MPV_common_end(s); s->parse_context = pc; } @@ -1298,7 +1298,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) * if DCT permutation is changed. */ memcpy(old_permutation, s->dsp.idct_permutation, 64 * sizeof(uint8_t)); - if (MPV_common_init(s) < 0) + if (ff_MPV_common_init(s) < 0) return -2; quant_matrix_rebuild(s->intra_matrix, old_permutation, s->dsp.idct_permutation); @@ -1563,7 +1563,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) /* start frame decoding */ if (s->first_field || s->picture_structure == PICT_FRAME) { - if (MPV_frame_start(s, avctx) < 0) + if (ff_MPV_frame_start(s, avctx) < 0) return -1; ff_er_frame_start(s); @@ -1753,13 +1753,13 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, s->dest[1] +=(16 >> lowres) >> s->chroma_x_shift; s->dest[2] +=(16 >> lowres) >> s->chroma_x_shift; - MPV_decode_mb(s, s->block); + ff_MPV_decode_mb(s, s->block); if (++s->mb_x >= s->mb_width) { const int mb_size = 16 >> s->avctx->lowres; ff_draw_horiz_band(s, mb_size*(s->mb_y >> field_pic), mb_size); - MPV_report_decode_progress(s); + ff_MPV_report_decode_progress(s); s->mb_x = 0; s->mb_y += 1 << field_pic; @@ -1912,7 +1912,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) ff_er_frame_end(s); - MPV_frame_end(s); + ff_MPV_frame_end(s); if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { *pict = *(AVFrame*)s->current_picture_ptr; @@ -2022,7 +2022,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx) /* start new MPEG-1 context decoding */ s->out_format = FMT_MPEG1; if (s1->mpeg_enc_ctx_allocated) { - MPV_common_end(s); + ff_MPV_common_end(s); } s->width = avctx->coded_width; s->height = avctx->coded_height; @@ -2037,7 +2037,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx) if (avctx->idct_algo == FF_IDCT_AUTO) avctx->idct_algo = FF_IDCT_SIMPLE; - if (MPV_common_init(s) < 0) + if (ff_MPV_common_init(s) < 0) return -1; exchange_uv(s); // common init reset pblocks, so we swap them here s->swap_uv = 1; // in case of xvmc we need to swap uv for each MB @@ -2478,7 +2478,7 @@ static int mpeg_decode_end(AVCodecContext *avctx) Mpeg1Context *s = avctx->priv_data; if (s->mpeg_enc_ctx_allocated) - MPV_common_end(&s->mpeg_enc_ctx); + ff_MPV_common_end(&s->mpeg_enc_ctx); return 0; } |