diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-09 00:32:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-09 00:32:38 +0100 |
| commit | 9273efac1b9ef79ca0ea5673d8088c501e19d70f (patch) | |
| tree | 844f8c736972c6f2e5669fc5810acb46c769f65f /libavcodec/dpcm.c | |
| parent | b1435626392bd05bd3e79a56d9f64c089654afda (diff) | |
| parent | ccc27e2139336b66cdec3bb73a2cc7e60ef7e599 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
bfi: Use bytestream2 functions to prevent buffer overreads.
dpcm: Fix invalid writes
utvideo: frame multithreading.
vorbis: An additional defense in the Vorbis codec.
vorbisdec: Fix decoding bug with channel handling
Conflicts:
libavcodec/dpcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dpcm.c')
| -rw-r--r-- | libavcodec/dpcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index 5f186ebd0d..929458a22b 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -288,7 +288,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, } case CODEC_ID_SOL_DPCM: if (avctx->codec_tag != 3) { - uint8_t *output_samples_u8 = output_samples; + uint8_t *output_samples_u8 = s->frame.data[0]; while (buf < buf_end) { uint8_t n = *buf++; |