diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-05 03:09:48 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-05 03:30:24 +0200 |
commit | b000b86e1dd03c4ff89cd63a6fa88fc280947c94 (patch) | |
tree | 8ba961dc8c013885d7bdfe944fb7cb31d5dc6d95 /libavcodec/vc1.c | |
parent | 9a5624a0f1b205e966391645a512c6dccdce42cd (diff) | |
parent | af1ca249e8eb685823dd0dade3aa3c1d119a61ec (diff) | |
download | ffmpeg-streaming-b000b86e1dd03c4ff89cd63a6fa88fc280947c94.zip ffmpeg-streaming-b000b86e1dd03c4ff89cd63a6fa88fc280947c94.tar.gz |
Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
doc: Check standalone compilation before submitting new components.
Fix standalone compilation of pipe protocol.
Fix standalone compilation of ac3_fixed encoder.
Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
Fix standalone compilation of IMC decoder.
Fix standalone compilation of WTV demuxer.
Fix standalone compilation of MXPEG decoder.
flashsv: K&R cosmetics
matroskaenc: fix memory leak
vc1: make overlap filter for I-frames bit-exact.
vc1dec: use s->start/end_mb_y instead of passing them as function args.
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
Replace strncpy() with av_strlcpy().
indeo3: Eliminate use of long.
get_bits: make cache unsigned to eliminate undefined signed overflow.
asfdec: fix assert failure on invalid files
avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled: mpegvideo: reindent.
nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0).
...
Conflicts:
doc/developer.texi
libavcodec/Makefile
libavcodec/get_bits.h
libavcodec/mpegvideo.c
libavformat/Makefile
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
-rw-r--r-- | libavcodec/vc1.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index ef44a34..e062a35 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -280,28 +280,6 @@ static int vop_dquant_decoding(VC1Context *v) static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb); -static void simple_idct_put_rangered(uint8_t *dest, int line_size, DCTELEM *block) -{ - int i; - ff_simple_idct(block); - for (i = 0; i < 64; i++) block[i] = (block[i] - 64) << 1; - ff_put_pixels_clamped_c(block, dest, line_size); -} - -static void simple_idct_put_signed(uint8_t *dest, int line_size, DCTELEM *block) -{ - ff_simple_idct(block); - ff_put_signed_pixels_clamped_c(block, dest, line_size); -} - -static void simple_idct_put_signed_rangered(uint8_t *dest, int line_size, DCTELEM *block) -{ - int i; - ff_simple_idct(block); - for (i = 0; i < 64; i++) block[i] <<= 1; - ff_put_signed_pixels_clamped_c(block, dest, line_size); -} - /** * Decode Simple/Main Profiles sequence header * @see Figure 7-8, p16-17 @@ -359,11 +337,7 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte v->res_fasttx = get_bits1(gb); if (!v->res_fasttx) { - v->vc1dsp.vc1_inv_trans_8x8_add = ff_simple_idct_add; - v->vc1dsp.vc1_inv_trans_8x8_put[0] = ff_simple_idct_put; - v->vc1dsp.vc1_inv_trans_8x8_put[1] = simple_idct_put_rangered; - v->vc1dsp.vc1_inv_trans_8x8_put_signed[0] = simple_idct_put_signed; - v->vc1dsp.vc1_inv_trans_8x8_put_signed[1] = simple_idct_put_signed_rangered; + v->vc1dsp.vc1_inv_trans_8x8 = ff_simple_idct; v->vc1dsp.vc1_inv_trans_8x4 = ff_simple_idct84_add; v->vc1dsp.vc1_inv_trans_4x8 = ff_simple_idct48_add; v->vc1dsp.vc1_inv_trans_4x4 = ff_simple_idct44_add; |