Changeset b342ea60 in ffmpeg

Timestamp:

Dec 6, 2013, 10:33:07 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0f057ea3

Parents:

d8fb209a (diff), 3360ad99 (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 commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'

• commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()

Conflicts:

libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h

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

(No files)