diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:46:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:46:30 +0100 |
| commit | f5d6541ba0d279955a2df798646e30370d85458a (patch) | |
| tree | 3ee7c30cd371173edccdc9e52b559f7f173053b9 /libavcodec/h263dec.c | |
| parent | 91c63cb053cd7a1be8bb22b3857a170eeb2b1f95 (diff) | |
| parent | ad09f52586eae4c5473c3a6a803d73e1ba56c0eb (diff) | |
| download | ffmpeg-f5d6541ba0d279955a2df798646e30370d85458a.tar.gz | |
Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'
* commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb':
h263dec: remove commented out cruft
Conflicts:
libavcodec/h263dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8daa6b9a98..be37f9d601 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -233,7 +233,6 @@ static int decode_slice(MpegEncContext *s) s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_16X16; -// s->mb_skipped = 0; av_dlog(s, "%d %d %06X\n", ret, get_bits_count(&s->gb), show_bits(&s->gb, 24)); ret = s->decode_mb(s, s->block); @@ -300,7 +299,6 @@ static int decode_slice(MpegEncContext *s) (s->workaround_bugs & FF_BUG_AUTODETECT) && get_bits_left(&s->gb) >= 0 && get_bits_left(&s->gb) < 137 && - // !s->resync_marker && !s->data_partitioning) { const int bits_count = get_bits_count(&s->gb); const int bits_left = s->gb.size_in_bits - bits_count; @@ -322,8 +320,7 @@ static int decode_slice(MpegEncContext *s) } if (s->workaround_bugs & FF_BUG_AUTODETECT) { - if (s->padding_bug_score > -2 && !s->data_partitioning - /* && (s->divx_version >= 0 || !s->resync_marker) */) + if (s->padding_bug_score > -2 && !s->data_partitioning) s->workaround_bugs |= FF_BUG_NO_PADDING; else s->workaround_bugs &= ~FF_BUG_NO_PADDING; @@ -502,12 +499,6 @@ retry: s->codec_tag == AV_RL32("ZMP4") || s->codec_tag == AV_RL32("SIPP")) s->xvid_build = 0; -#if 0 - if (s->codec_tag == AV_RL32("DIVX") && s->vo_type == 0 && - s->vol_control_parameters == 1 && - s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc - s->xvid_build = 0; -#endif } if (s->xvid_build == -1 && s->divx_version == -1 && s->lavc_build == -1) @@ -572,21 +563,6 @@ retry: if (s->divx_version >= 0) s->workaround_bugs |= FF_BUG_HPEL_CHROMA; -#if 0 - if (s->divx_version == 500) - s->padding_bug_score = 256 * 256 * 256 * 64; - - /* very ugly XVID padding bug detection FIXME/XXX solve this differently - * Let us hope this at least works. */ - if (s->resync_marker == 0 && s->data_partitioning == 0 && - s->divx_version == -1 && s->codec_id == AV_CODEC_ID_MPEG4 && - s->vo_type == 0) - s->workaround_bugs |= FF_BUG_NO_PADDING; - - // FIXME not sure about the version num but a 4609 file seems ok - if (s->lavc_build < 4609U) - s->workaround_bugs |= FF_BUG_NO_PADDING; -#endif } if (s->workaround_bugs & FF_BUG_STD_QPEL) { |