diff options
author | Thilo Borgmann <thilo.borgmann@googlemail.com> | 2009-04-07 15:59:50 +0000 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2009-04-07 15:59:50 +0000 |
commit | 7a00bbad2100367481240e62876b941b5c4befdc (patch) | |
tree | 33b1fddad2133b281b84dfbd48248b15e096a281 /libavcodec/smacker.c | |
parent | 18c915eef4ddc2441d00608edf691a2425ba51de (diff) | |
download | ffmpeg-7a00bbad2100367481240e62876b941b5c4befdc.tar.gz |
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/smacker.c')
-rw-r--r-- | libavcodec/smacker.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index ad5827ea22..ac638f8522 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -345,8 +345,10 @@ static av_always_inline int smk_get_code(GetBitContext *gb, int *recode, int *la return v; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; SmackVContext * const smk = avctx->priv_data; uint8_t *out; uint32_t *pal; @@ -565,8 +567,10 @@ static av_cold int smka_decode_init(AVCodecContext *avctx) /** * Decode Smacker audio data */ -static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; GetBitContext gb; HuffContext h[4]; VLC vlc[4]; |