[FFmpeg-cvslog] Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'

[Michael Niedermayer]

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

Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'

* commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7':
  mjpegenc: do not pass MpegEncContext to jpeg_table_header()

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

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