Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 10:33:07 +0000 (11:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 10:33:07 +0000 (11:33 +0100)
commitb342ea603f0c767759639a002b9db638231e989c
tree7bcaa714f6ad6246749cb53a9f882b3da0119fdf
parentd8fb209a7fbe0256a86df578b0c8d284e2a0d3e2
parent3360ad995530ea6967b1e83981b4aa8240fbb0ed
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>
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
libavcodec/mpegvideo_enc.c