diff options
| author | Paul B Mahol <onemda@gmail.com> | 2011-11-30 00:32:23 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2011-12-01 15:32:20 +0000 |
| commit | 06029fbb7fb33147ef287cbba4ad5e28efeaab3d (patch) | |
| tree | c34b4221124e01ac040de480c7b5baf2210cd22b | |
| parent | 7d64391441681c2cbefce21abf77f92fed2f7319 (diff) | |
| download | ffmpeg-06029fbb7fb33147ef287cbba4ad5e28efeaab3d.tar.gz | |
escape130: minimal effort to make it compile without warnings
| -rw-r--r-- | libavcodec/escape130.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c index cd977cf83b..f6ce81e8f0 100644 --- a/libavcodec/escape130.c +++ b/libavcodec/escape130.c @@ -22,7 +22,7 @@ #include "avcodec.h" #define ALT_BITSTREAM_READER_LE -#include "bitstream.h" +#include "get_bits.h" typedef struct Escape130Context { AVFrame frame; @@ -91,8 +91,10 @@ static unsigned decode_skip_count(GetBitContext* gb) { */ static int escape130_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Escape130Context *s = avctx->priv_data; GetBitContext gb; @@ -294,14 +296,14 @@ static int escape130_decode_frame(AVCodecContext *avctx, } -AVCodec escape130_decoder = { - "escape130", - CODEC_TYPE_VIDEO, - CODEC_ID_ESCAPE130, - sizeof(Escape130Context), - escape130_decode_init, - NULL, - escape130_decode_close, - escape130_decode_frame, - CODEC_CAP_DR1, +AVCodec ff_escape130_decoder = { + .name = "escape130", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_ESCAPE130, + .priv_data_size = sizeof(Escape130Context), + .init = escape130_decode_init, + .close = escape130_decode_close, + .decode = escape130_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Escape 130"), }; |