diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 00:49:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 01:34:37 +0100 |
| commit | 6cb2085278bdd3ee83d5ed528d98c78756ee7277 (patch) | |
| tree | da57b6491e07c2deb9cf57e3cd595323d118c244 /libavcodec/vc1.c | |
| parent | 8812c97b98321f82763b7c9c1363c7c1f6cace8f (diff) | |
| parent | 210f72845c11fbab7b913a4f18ffd67e99d2dd4f (diff) | |
| download | ffmpeg-6cb2085278bdd3ee83d5ed528d98c78756ee7277.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
ppc: Add ff_ prefix to nonstatic symbols
sh4: Add ff_ prefix to nonstatic symbols
mpegvideo: Add ff_ prefix to nonstatic functions
rtjpeg: Add ff_ prefix to nonstatic symbols
rv: Add ff_ prefix to nonstatic symbols
vp56: Add ff_ prefix to nonstatic symbols
vorbis: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefix to nonstatic symbols
vc1: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefixes to nonstatic symbols
snow: Add ff_ prefix to nonstatic symbols
mpeg12: Add ff_ prefix to nonstatic symbols
mpeg4: Add ff_ prefixes to nonstatic symbols
lagarith: Add ff_ prefix to lag_rac_init
libavcodec: Add ff_ prefix to j_rev_dct*
dsputil: Add ff_ prefix to inv_zigzag_direct16
libavcodec: Prefix fdct_ifast, fdct_ifast248
dsputil: Add ff_ prefix to the dsputil*_init* functions
libavcodec: Add ff_ prefix to some nonstatic symbols
vlc/rl: Add ff_ prefix to the nonstatic symbols
...
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/nuv.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/proresdsp.c
libavcodec/svq3.c
libavcodec/version.h
libavformat/dv.h
libavformat/dvenc.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index a012967e3e..93b9b275de 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -291,7 +291,7 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb); * @param gb GetBit context initialized from Codec context extra_data * @return Status */ -int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitContext *gb) +int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitContext *gb) { av_log(avctx, AV_LOG_DEBUG, "Header: %0X\n", show_bits(gb, 32)); v->profile = get_bits(gb, 2); @@ -304,8 +304,8 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte v->zz_4x8 = ff_vc1_adv_progressive_4x8_zz; return decode_sequence_header_adv(v, gb); } else { - v->zz_8x4 = wmv2_scantableA; - v->zz_4x8 = wmv2_scantableB; + v->zz_8x4 = ff_wmv2_scantableA; + v->zz_4x8 = ff_wmv2_scantableB; v->res_y411 = get_bits1(gb); v->res_sprite = get_bits1(gb); if (v->res_y411) { @@ -525,7 +525,7 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) return 0; } -int vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContext *gb) +int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContext *gb) { int i; @@ -574,7 +574,7 @@ int vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContext * return 0; } -int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) +int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) { int pqindex, lowquant, status; @@ -817,7 +817,7 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); \ } -int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) +int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) { int pqindex, lowquant; int status; |