diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 10:08:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 10:08:50 +0200 |
| commit | 60657ee37afb5388b75430db95cbce5146731c63 (patch) | |
| tree | 0d802ab312d22ed5bc1f42fd3bcaa4bf4e027f28 /libavcodec | |
| parent | 90c8863a749432608b05d2b7d93475e8ebd62bbb (diff) | |
| parent | e7a44f87d07655ec0cd31c315936931674434340 (diff) | |
| download | ffmpeg-60657ee37afb5388b75430db95cbce5146731c63.tar.gz | |
Merge commit 'e7a44f87d07655ec0cd31c315936931674434340'
* commit 'e7a44f87d07655ec0cd31c315936931674434340':
4xm: refactor fourxm_read_header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 18b1fe9756..a396a6d739 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -411,12 +411,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; if (length < extra) |