Changeset 27801500 in ffmpeg

Timestamp:

Apr 29, 2015, 1:47:15 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

966a57b6

Parents:

77010a41 (diff), 3919a457 (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> (04/29/15 01:45:27)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/29/15 01:47:15)

Message:

Merge commit '3919a4572690894d0a7ad4170d699c52b4748194'

• commit '3919a4572690894d0a7ad4170d699c52b4748194': jpeglsenc: Check memory allocations

Conflicts:

libavcodec/jpeglsenc.c

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

(No files)