Commit 2ba0953e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1d177200'

* commit '1d177200':
  wavpack: remove a useless check.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8d4e934d 1d177200
...@@ -803,11 +803,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, ...@@ -803,11 +803,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
"a sequence: %d and %d\n", wc->samples, s->samples); "a sequence: %d and %d\n", wc->samples, s->samples);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (!s->samples) {
*got_frame_ptr = 0;
return 0;
}
} else { } else {
s->samples = wc->samples; s->samples = wc->samples;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment