diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-30 13:45:10 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-30 13:47:45 +0200 |
| commit | 742b9617698f189e5bd911a600e6547b21bf6699 (patch) | |
| tree | 64093b7c8495040a109980116f111611002229a4 | |
| parent | 674d8a9629609a17fd6916164556cb012d6e6a1c (diff) | |
| download | ffmpeg-742b9617698f189e5bd911a600e6547b21bf6699.tar.gz | |
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.
| -rw-r--r-- | libavcodec/ra144.h | 2 | ||||
| -rw-r--r-- | libavcodec/ra144dec.c | 6 | ||||
| -rw-r--r-- | libavcodec/ra144enc.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h index 426fea3be4..763495dce7 100644 --- a/libavcodec/ra144.h +++ b/libavcodec/ra144.h @@ -30,7 +30,7 @@ #define BLOCKSIZE 40 ///< subblock size in 16-bit words #define BUFFERSIZE 146 ///< the size of the adaptive codebook #define FIXED_CB_SIZE 128 ///< size of fixed codebooks -#define FRAMESIZE 20 ///< size of encoded frame +#define FRAME_SIZE 20 ///< size of encoded frame #define LPC_ORDER 10 ///< order of LPC filter typedef struct RA144Context { diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index 63f77e0f90..9969fd87b5 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -76,7 +76,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, RA144Context *ractx = avctx->priv_data; GetBitContext gb; - if (buf_size < FRAMESIZE) { + if (buf_size < FRAME_SIZE) { av_log(avctx, AV_LOG_ERROR, "Frame too small (%d bytes). Truncated file?\n", buf_size); *got_frame_ptr = 0; @@ -89,7 +89,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, return ret; samples = (int16_t *)frame->data[0]; - init_get_bits(&gb, buf, FRAMESIZE * 8); + init_get_bits(&gb, buf, FRAME_SIZE * 8); for (i = 0; i < LPC_ORDER; i++) lpc_refl[i] = ff_lpc_refl_cb[i][get_bits(&gb, sizes[i])]; @@ -122,7 +122,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, *got_frame_ptr = 1; - return FRAMESIZE; + return FRAME_SIZE; } AVCodec ff_ra_144_decoder = { diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 2eac343165..da55b73560 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -447,7 +447,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (ractx->last_frame) return 0; - if ((ret = ff_alloc_packet2(avctx, avpkt, FRAMESIZE)) < 0) + if ((ret = ff_alloc_packet2(avctx, avpkt, FRAME_SIZE)) < 0) return ret; /** @@ -536,7 +536,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ff_af_queue_remove(&ractx->afq, avctx->frame_size, &avpkt->pts, &avpkt->duration); - avpkt->size = FRAMESIZE; + avpkt->size = FRAME_SIZE; *got_packet_ptr = 1; return 0; } |