diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-05-18 14:33:33 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-06-21 11:17:59 +0200 |
| commit | bc7f4268514624e1286ea76d27a89a56b4ee18e1 (patch) | |
| tree | 1530a0cd7116d496288d8798d830482fcc72089b | |
| parent | 8281cd5cb80582d668ce0848e0e035b383f161f6 (diff) | |
| download | ffmpeg-bc7f4268514624e1286ea76d27a89a56b4ee18e1.tar.gz | |
h264: drop tests whether the codec id is AV_CODEC_ID_H264
Those are unused remnants of the old SVQ3 code.
| -rw-r--r-- | libavcodec/h264_slice.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264dec.c | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 376be278a1..eee222f71a 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -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) { diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 52cb9ae02d..cc5bdca43c 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -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, |