Browse Source

h264: drop tests whether the codec id is AV_CODEC_ID_H264

Those are unused remnants of the old SVQ3 code.
tags/n3.2
Anton Khirnov 9 years ago
parent
commit
bc7f426851
2 changed files with 3 additions and 6 deletions
  1. +0
    -1
      libavcodec/h264_slice.c
  2. +3
    -5
      libavcodec/h264dec.c

+ 0
- 1
libavcodec/h264_slice.c View File

@@ -2111,7 +2111,6 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
sl->deblocking_filter = 0;

sl->is_complex = FRAME_MBAFF(h) || h->picture_structure != PICT_FRAME ||
avctx->codec_id != AV_CODEC_ID_H264 ||
(CONFIG_GRAY && (h->flags & AV_CODEC_FLAG_GRAY));

if (h->ps.pps->cabac) {


+ 3
- 5
libavcodec/h264dec.c View File

@@ -371,11 +371,9 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
return AVERROR_UNKNOWN;
}

if (avctx->codec_id == AV_CODEC_ID_H264) {
if (avctx->ticks_per_frame == 1)
h->avctx->framerate.num *= 2;
avctx->ticks_per_frame = 2;
}
if (avctx->ticks_per_frame == 1)
h->avctx->framerate.num *= 2;
avctx->ticks_per_frame = 2;

if (avctx->extradata_size > 0 && avctx->extradata) {
ret = ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size,


Loading…
Cancel
Save