Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / dpcm.c

diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
index 8f6cd8e115da90be527f14ba4b010666b0e45f7f..2f87f51774dbd6ab19d3671443d6797fc2d99056 100644 (file)
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@@ -179,9 +179,6 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     int stereo = s->channels - 1;
     int16_t *output_samples = data;
 
-    if (!buf_size)
-        return 0;
-
     /* calculate output size */
     switch(avctx->codec->id) {
     case CODEC_ID_ROQ_DPCM:
@@ -201,7 +198,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         break;
     }
     out *= av_get_bytes_per_sample(avctx->sample_fmt);
-    if (out < 0) {
+    if (out <= 0) {
         av_log(avctx, AV_LOG_ERROR, "packet is too small\n");
         return AVERROR(EINVAL);
     }