Changeset 962654f2 in ffmpeg

Timestamp:

Jun 9, 2015, 4:09:26 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dac7b278

Parents:

551813a9 (diff), b380337 (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> (06/09/15 16:08:41)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/09/15 16:09:26)

Message:

Merge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2'

• commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2': mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail

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

(No files)