Merge commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 09:06:43 +0000 (10:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 09:06:43 +0000 (10:06 +0100)
* commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8':
  mjpegenc: remove commented out never-to-be-finished WIP cruft

Conflicts:
libavcodec/mjpegenc.c

The unfinished 2-matrix code is left in place and not removed

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

Trivial merge