diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 00:17:02 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 00:17:02 +0400 |
| commit | b4780d03d04d402b490be21b01ec886565cabe29 (patch) | |
| tree | 2c5605baa7b588cced8f79c2916eb724356d5c25 /libavcodec/dpx.c | |
| parent | 69aeba1396d5a13e79cbc3cc9f49fd6896addb82 (diff) | |
| parent | 2096857551660649dbe9a5aad7338b0872858575 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
rational: add av_inv_q() returning the inverse of an AVRational
dpx: Make start offset unsigned
lavfi: properly signal out-of-memory error in ff_filter_samples
cosmetics: Fix a few switched periods and linebreaks
zerocodec: Fix memleak in decode_frame
zerocodec: Cosmetics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dpx.c')
| -rw-r--r-- | libavcodec/dpx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 6ef2db2299..791e66af7b 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -62,7 +62,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *const p = &s->picture; uint8_t *ptr; - int magic_num, offset, endian; + unsigned int offset; + int magic_num, endian; int x, y; int w, h, stride, bits_per_color, descriptor, elements, target_packet_size, source_packet_size; |