Changeset 9273efac in ffmpeg

Timestamp:

Jan 8, 2012, 11:32:38 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

72c5828c

Parents:

b1435626 (diff), ccc27e21 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)