diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-22 22:26:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-22 22:26:42 +0200 |
| commit | 92ef4be4ab9fbb7d901b22e0036a4ca90b00a476 (patch) | |
| tree | c04ededf84f089de4f9ef417ca6ecc715b84fa4b /libavcodec/h263dec.c | |
| parent | 2e07f42957666df6d7c63a62263b8447e97b1442 (diff) | |
| parent | d526c5338d50d12a54fd95130030c60070707d3e (diff) | |
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/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 34b76d32ee..4e8ff5d6bf 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -151,7 +151,7 @@ static int get_consumed_bytes(MpegEncContext *s, int buf_size){ static int decode_slice(MpegEncContext *s){ const int part_mask= s->partitioned_frame ? (ER_AC_END|ER_AC_ERROR) : 0x7F; - const int mb_size= 16>>s->avctx->lowres; + const int mb_size = 16; s->last_resync_gb= s->gb; s->first_slice_line= 1; @@ -764,7 +764,6 @@ AVCodec ff_h263_decoder = { .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, - .max_lowres = 3, .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), .pix_fmts = ff_hwaccel_pixfmt_list_420, }; |