[FFmpeg-cvslog] Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 04:31:10 2013 +0100| [4a0d8277d5f6fbc2eeac5e40c5cef55316839cfc] | committer: Michael Niedermayer

Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'

* commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9':
  mjpegenc: do not pass MpegEncContext to put_huffman_table()

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

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