1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Merge commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8'

* commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8':
  wavpack: remove a useless check.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-28 11:13:00 +02:00

View File

@@ -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;
} }