Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 10:40:30 +0000 (11:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 10:40:30 +0000 (11:40 +0100)
commit0f057ea3c5484d7df8a951c1fdeb8b873ae382e2
treedd8672f17b58a14f57e62437ea8123f77a93f868
parentb342ea603f0c767759639a002b9db638231e989c
parent86eb2eaac629909d6ee4067c6f1e485a4e70473d
Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'

* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()

Conflicts:
libavcodec/mjpegenc.h

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