diff options
author | Mike Melanson <mike@multimedia.cx> | 2004-02-01 05:31:16 +0000 |
---|---|---|
committer | Mike Melanson <mike@multimedia.cx> | 2004-02-01 05:31:16 +0000 |
commit | 61d793ef13ac2ef8f9c2b41b71430f21fac80337 (patch) | |
tree | 69a1b20b01993b4d61fe1c8c2be33dd2e362a40c /src/libffmpeg/libavcodec/cinepak.c | |
parent | f707774ac5d48c02c6a36327304d88629b0e38f9 (diff) | |
download | xine-lib-61d793ef13ac2ef8f9c2b41b71430f21fac80337.tar.gz xine-lib-61d793ef13ac2ef8f9c2b41b71430f21fac80337.tar.bz2 |
sync to ffmpeg build 4699
CVS patchset: 6090
CVS date: 2004/02/01 05:31:16
Diffstat (limited to 'src/libffmpeg/libavcodec/cinepak.c')
-rw-r--r-- | src/libffmpeg/libavcodec/cinepak.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libffmpeg/libavcodec/cinepak.c b/src/libffmpeg/libavcodec/cinepak.c index 56c4990be..e8d3efc3c 100644 --- a/src/libffmpeg/libavcodec/cinepak.c +++ b/src/libffmpeg/libavcodec/cinepak.c @@ -37,9 +37,6 @@ #define PALETTE_COUNT 256 -#undef BE_16 -#undef BE_32 - #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) #define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ (((uint8_t*)(x))[1] << 16) | \ @@ -421,7 +418,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx, s->size = buf_size; if (avctx->get_buffer(avctx, &s->frame)) { - printf (" Cinepak: get_buffer() failed\n"); + av_log(avctx, AV_LOG_ERROR, " Cinepak: get_buffer() failed\n"); return -1; } |