Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-28 13:13:00 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-05-28 13:13:14 +0400
commit2ba0953ee4bdc478e7ec1bd42bfa3aed7d810442 (patch)
tree88c2117452ab3d1fe0592dafc9b3445854fa23ee /libavcodec/wavpack.c
parent8d4e934df94e7324d56a13abca22c3cc21f2ac7d (diff)
parent1d177200ce1ffd8902729e3a4d647b04fc4b35f8 (diff)
Merge commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8'
* commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8': wavpack: remove a useless check. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpack.c')
-rw-r--r--libavcodec/wavpack.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 2f20f8270e..e80f4c5f6a 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -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;
}