Changeset 78e39aa in ffmpeg

Timestamp:

Jan 20, 2014, 6:54:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f70d7eb2

Parents:

eef74b2e (diff), b7702faf (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> (01/20/14 18:54:41)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/20/14 18:54:45)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Avoid a possible overflow when reading Nikon avi files. Add h263dsp dependency to mpeg1video and mpeg2video encoders. Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc

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

(No files)