Merge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:33:27 +0000 (21:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:34:45 +0000 (21:34 +0100)
commit8d6b51b18206a133d985f4cc065945b696ed5058
tree0e212cce5208d225f9d1672eee0a81dd92ab6d36
parentd3127691665ca071e6b090283b677efc9f2de8f1
parentdb71c4926d948717ce3b74253eb385dc43dcb14d
Merge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'

* commit 'db71c4926d948717ce3b74253eb385dc43dcb14d':
  mjpegenc: fix argument size in encode_mb

Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h

See: 256f530603ef3838a712a4fcd737b46b7bce455e
Merged-by: Michael Niedermayer <michaelni@gmx.at>