ffmpeg | branch: master | Matthieu Bouron <[email protected]> | Fri Jan 20 17:29:09 2017 +0100| [cf3affabb449671ce16cee61d98393c43ff171f4] | committer: Matthieu Bouron
lavc/h264dec: re-indent after previous commit > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf3affabb449671ce16cee61d98393c43ff171f4 --- libavcodec/h264dec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index f18fb0b..665d3e46 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -680,11 +680,11 @@ again: break; if (h->current_slice == 1) { - if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel && - i >= nals_needed && !h->setup_finished && h->cur_pic_ptr) { - ff_thread_finish_setup(avctx); - h->setup_finished = 1; - } + if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel && + i >= nals_needed && !h->setup_finished && h->cur_pic_ptr) { + ff_thread_finish_setup(avctx); + h->setup_finished = 1; + } if (h->avctx->hwaccel && (ret = h->avctx->hwaccel->start_frame(h->avctx, buf, buf_size)) < 0) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
