Changeset c40a35f8 in ffmpeg

Timestamp:

Nov 30, 2011, 1:34:35 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d31c68a7

Parents:

23b4f355 (diff), 464ccb01 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/30/11 01:24:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/30/11 01:34:35)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: indeo3: check per-plane data buffer against input buffer bounds. avconv: Handle audio sync for non-S16 sample formats. pthread: don't increment index on zero-sized packets.

Conflicts:

libavcodec/indeo3.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)