lavc/mediacodec: use ternary operator to set slice-height value

308d3ed5 · Matthieu Bouron · 8f2a1990 · 308d3ed5
Commit 308d3ed5 authored Mar 28, 2016 by Matthieu Bouron
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

mediacodecdec.c libavcodec/mediacodecdec.c +1 -5

No files found.
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -255,11 +255,7 @@ static int mediacodec_dec_parse_format(AVCodecContext *avctx, MediaCodecDecConte
        av_freep(&format);
        return AVERROR_EXTERNAL;
    }
-    if (value > 0) {
+    s->slice_height = value > 0 ? value : s->height;
-        s->slice_height = value;
-    } else {
-        s->slice_height = s->height;
-    }
    if (strstr(s->codec_name, "OMX.Nvidia.")) {
        s->slice_height = FFALIGN(s->height, 16);