From 149f2058a4119d3130243b4e85b02c3a15bb9694 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Mon, 30 Jan 2012 13:33:05 -0500 Subject: adpcmenc: use int16_t and uint8_t instead of short and unsigned char. --- libavcodec/adpcm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/adpcm.h') diff --git a/libavcodec/adpcm.h b/libavcodec/adpcm.h index aed5048d4a..3a054c0e84 100644 --- a/libavcodec/adpcm.h +++ b/libavcodec/adpcm.h @@ -30,14 +30,14 @@ typedef struct ADPCMChannelStatus { int predictor; - short int step_index; + int16_t step_index; int step; /* for encoding */ int prev_sample; /* MS version */ - short sample1; - short sample2; + int16_t sample1; + int16_t sample2; int coeff1; int coeff2; int idelta; -- cgit v1.2.3 From b010178e84c950cf9b1a8b9c94ecaca79bd41895 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 31 Jan 2012 18:41:52 +0100 Subject: adpcm: Add missing stdint.h #include to fix standalone header compilation. --- libavcodec/adpcm.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavcodec/adpcm.h') diff --git a/libavcodec/adpcm.h b/libavcodec/adpcm.h index 3a054c0e84..16facb6d0f 100644 --- a/libavcodec/adpcm.h +++ b/libavcodec/adpcm.h @@ -26,6 +26,8 @@ #ifndef AVCODEC_ADPCM_H #define AVCODEC_ADPCM_H +#include + #define BLKSIZE 1024 typedef struct ADPCMChannelStatus { -- cgit v1.2.3