Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 09:14:15 +0000 (10:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 09:28:20 +0000 (10:28 +0100)
commit5cda499d6607050c70f90315845ceb1cec4266bd
treef3148f9d7a968f6d7374e321bc631319afb5d2bb
parent5ac558113202faef976e2095dfa14618e8e96b6d
parent6d70639c7d5fe762c5f18de574eafa817fb53ef7
Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegenc.c