diff options
| author | James Almer <jamrial@gmail.com> | 2016-08-01 18:15:07 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-08-01 18:15:07 -0300 |
| commit | 517dd04f6df3103a6f2bc20b43b956d055ad983f (patch) | |
| tree | 68ec6cc818b6075ee1c88b100e502148ac51741f | |
| parent | fd4eb56528e1bf6529397051838a28d2a39d8e01 (diff) | |
| parent | bc7f4268514624e1286ea76d27a89a56b4ee18e1 (diff) | |
Merge commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1'
* commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1':
h264: drop tests whether the codec id is AV_CODEC_ID_H264
Conflicts:
libavcodec/h264dec.c
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/h264_slice.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264dec.c | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index fcc844390d..7d1817c875 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -2349,7 +2349,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->avctx->active_thread_type & FF_THREAD_SLICE) && h->picture_structure == PICT_FRAME && h->slice_ctx[0].er.error_status_table) { diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index d944a8ce93..323639dc19 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -406,15 +406,13 @@ 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) { - if(h->avctx->time_base.den < INT_MAX/2) { - h->avctx->time_base.den *= 2; - } else - h->avctx->time_base.num /= 2; - } - avctx->ticks_per_frame = 2; + if (avctx->ticks_per_frame == 1) { + if(h->avctx->time_base.den < INT_MAX/2) { + h->avctx->time_base.den *= 2; + } else + h->avctx->time_base.num /= 2; } + avctx->ticks_per_frame = 2; if (avctx->extradata_size > 0 && avctx->extradata) { ret = ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size, |