mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8'
* commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8': wavpack: remove a useless check. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
2ba0953ee4
|
@ -803,11 +803,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||
"a sequence: %d and %d\n", wc->samples, s->samples);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
if (!s->samples) {
|
||||
*got_frame_ptr = 0;
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
s->samples = wc->samples;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue