Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 02:29:58 +0000 (04:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 02:29:58 +0000 (04:29 +0200)
* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
  hqx: Merge invalid format check within switch block

Conflicts:
libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hqx.c

@@@ -605,10 -571,9 +605,9 @@@ static int hqx_decode_frame(AVCodecCont
          break;
      case HQX_444A:
          avctx->pix_fmt = AV_PIX_FMT_YUVA444P16;
 -        decode_func = hqx_decode_444a;
 +        arg_data.decode_func = hqx_decode_444a;
          break;
-     }
-     if (!arg_data.decode_func) {
+     default:
          av_log(avctx, AV_LOG_ERROR, "Invalid format: %d.\n", ctx->format);
          return AVERROR_INVALIDDATA;
      }