Merge commit 'e7188a1a'

* commit 'e7188a1a':
  avprobe: remove a pointless condition and a dead branch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

ffprobe.c

@@ -2135,6 +2135,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
     AVBPrint pbuf;
     const AVCodecDescriptor *cd;
     int ret = 0;
+    const char *profile = NULL;
 
     av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
 
@@ -2142,8 +2143,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
 
     print_int("index", stream->index);
 
-    if ((dec_ctx = stream->codec)) {
-        const char *profile = NULL;
+    dec_ctx = stream->codec;
     dec = dec_ctx->codec;
     if (dec) {
         print_str("codec_name", dec->name);
@@ -2212,6 +2212,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
             print_str    ("color_range", av_color_range_name(dec_ctx->color_range));
         else
             print_str_opt("color_range", "N/A");
+
         s = av_get_colorspace_name(dec_ctx->colorspace);
         if (s) print_str    ("color_space", s);
         else   print_str_opt("color_space", "unknown");
@@ -2272,9 +2273,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
             print_str_opt("height",  "N/A");
         break;
     }
-    } else {
-        print_str_opt("codec_type", "unknown");
-    }
+
     if (dec_ctx->codec && dec_ctx->codec->priv_class && show_private_data) {
         const AVOption *opt = NULL;
         while (opt = av_opt_next(dec_ctx->priv_data,opt)) {