Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:31:10 +0000 (04:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 04:01:07 +0000 (05:01 +0100)
* commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9':
  mjpegenc: do not pass MpegEncContext to put_huffman_table()

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

Simple merge