On 03/18/2012 10:33 PM, Ronald S. Bultje wrote:

> ---
>  libavcodec/dpcm.c |   58 ++++++++++++++++++++++++++++------------------------
>  1 files changed, 31 insertions(+), 27 deletions(-)
> 
> diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
[...]
> @@ -293,9 +296,10 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void 
> *data,
>      }
>      case CODEC_ID_SOL_DPCM:
>          if (avctx->codec_tag != 3) {
> -            uint8_t *output_samples_u8 = s->frame.data[0];
> -            while (buf < buf_end) {
> -                uint8_t n = *buf++;
> +            uint8_t *output_samples_u8 = s->frame.data[0],
> +                    *samples_end_u8 = output_samples_u8 + out;
> +            while (output_samples_u8 < samples_end_u8) {
> +                int n = bytestream2_get_byteu(&gb);
>  
>                  s->sample[0] += s->sol_table[n >> 4];
>                  s->sample[0]  = av_clip_uint8(s->sample[0]);
> @@ -306,8 +310,8 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void 
> *data,
>                  *output_samples_u8++ = s->sample[stereo];
>              }


Since that loop writes 2 samples in each iteration, could you add a
check againse samples_end_u8 in-between just to be sure?

The rest LGTM.

-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to