aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-22 22:26:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-22 22:26:42 +0200
commit92ef4be4ab9fbb7d901b22e0036a4ca90b00a476 (patch)
treec04ededf84f089de4f9ef417ca6ecc715b84fa4b /libavcodec/dvdec.c
parent2e07f42957666df6d7c63a62263b8447e97b1442 (diff)
parentd526c5338d50d12a54fd95130030c60070707d3e (diff)
downloadffmpeg-92ef4be4ab9fbb7d901b22e0036a4ca90b00a476.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ARM: allow runtime masking of CPU features dsputil: remove unused functions mov: Treat keyframe indexes as 1-origin if starting at non-zero. mov: Take stps entries into consideration also about key_off. Remove lowres video decoding Conflicts: ffmpeg.c ffplay.c libavcodec/arm/vp8dsp_init_arm.c libavcodec/libopenjpegdec.c libavcodec/mjpegdec.c libavcodec/mpegvideo.c libavcodec/utils.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdec.c')
-rw-r--r--libavcodec/dvdec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index 4e09d0dd9a..f0fa5e9023 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -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)"),
};