[FFmpeg-cvslog] Merge commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 10:06:43 2013 +0100| [5ac558113202faef976e2095dfa14618e8e96b6d] | committer: Michael Niedermayer

Merge commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ac558113202faef976e2095dfa14618e8e96b6d
---