* commit '058d5f2f':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()

Conflicts:
	libavcodec/mjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>