diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-06-05 18:45:45 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-06-12 14:45:46 +0200 |
| commit | e7a44f87d07655ec0cd31c315936931674434340 (patch) | |
| tree | eef8c4738d16bb7e376cb1faabae0884fd640ca7 /libavcodec/4xm.c | |
| parent | e6496ea7e7ea7355167a1ccbe67a7199d446a654 (diff) | |
| download | ffmpeg-e7a44f87d07655ec0cd31c315936931674434340.tar.gz | |
4xm: refactor fourxm_read_header
Split sound and video tag parsing in separate functions.
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 71fe3f2d65..1002762396 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -389,12 +389,14 @@ static int decode_p_frame(FourXContext *f, AVFrame *frame, int x, y; const int width = f->avctx->width; const int height = f->avctx->height; - uint16_t *src = (uint16_t *)f->last_picture->data[0]; uint16_t *dst = (uint16_t *)frame->data[0]; const int stride = frame->linesize[0] >> 1; + uint16_t *src; unsigned int bitstream_size, bytestream_size, wordstream_size, extra, bytestream_offset, wordstream_offset; + src = (uint16_t *)f->last_picture->data[0]; + if (f->version > 1) { extra = 20; bitstream_size = AV_RL32(buf + 8); |