har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h264: drop tests whether the codec id is AV_CODEC_ID_H264

Browse Source 
Those are unused remnants of the old SVQ3 code.
This commit is contained in:
Anton Khirnov 2016-05-18 14:33:33 +02:00
parent 8281cd5cb8
commit bc7f426851
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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->deblocking_filter = 0;
sl->is_complex = FRAME_MBAFF(h) || h->picture_structure != PICT_FRAME || 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)); (CONFIG_GRAY && (h->flags & AV_CODEC_FLAG_GRAY));
if (h->ps.pps->cabac) { if (h->ps.pps->cabac) {

8
libavcodec/h264dec.c
View File

@ -371,11 +371,9 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
if (avctx->codec_id == AV_CODEC_ID_H264) { if (avctx->ticks_per_frame == 1)
if (avctx->ticks_per_frame == 1) h->avctx->framerate.num *= 2;
h->avctx->framerate.num *= 2; avctx->ticks_per_frame = 2;
avctx->ticks_per_frame = 2;
}
if (avctx->extradata_size > 0 && avctx->extradata) { if (avctx->extradata_size > 0 && avctx->extradata) {
ret = ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size, ret = ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size,