diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-12-01 21:35:02 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-12-05 13:33:40 +0100 |
| commit | ff506c75b71d7aaa1062b49043e0b881b1e263e9 (patch) | |
| tree | e72ca45617d01e32a171489b9dfeea80928c5783 | |
| parent | a1ba1f20b350cb89e645f17bdb237d027170db33 (diff) | |
| download | ffmpeg-ff506c75b71d7aaa1062b49043e0b881b1e263e9.tar.gz | |
mjpegenc: do not pass MpegEncContext to put_huffman_table()
It only needs PutBitContext from it, so pass that directly.
| -rw-r--r-- | libavcodec/mjpegenc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index c92be63562..d67afe265c 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -81,10 +81,9 @@ void ff_mjpeg_encode_close(MpegEncContext *s) } /* table_class: 0 = DC coef, 1 = AC coefs */ -static int put_huffman_table(MpegEncContext *s, int table_class, int table_id, +static int put_huffman_table(PutBitContext *p, int table_class, int table_id, const uint8_t *bits_table, const uint8_t *value_table) { - PutBitContext *p = &s->pb; int n, i; put_bits(p, 4, table_class); @@ -136,14 +135,14 @@ static void jpeg_table_header(MpegEncContext *s) ptr = put_bits_ptr(p); put_bits(p, 16, 0); /* patched later */ size = 2; - size += put_huffman_table(s, 0, 0, avpriv_mjpeg_bits_dc_luminance, + size += put_huffman_table(p, 0, 0, avpriv_mjpeg_bits_dc_luminance, avpriv_mjpeg_val_dc); - size += put_huffman_table(s, 0, 1, avpriv_mjpeg_bits_dc_chrominance, + size += put_huffman_table(p, 0, 1, avpriv_mjpeg_bits_dc_chrominance, avpriv_mjpeg_val_dc); - size += put_huffman_table(s, 1, 0, avpriv_mjpeg_bits_ac_luminance, + size += put_huffman_table(p, 1, 0, avpriv_mjpeg_bits_ac_luminance, avpriv_mjpeg_val_ac_luminance); - size += put_huffman_table(s, 1, 1, avpriv_mjpeg_bits_ac_chrominance, + size += put_huffman_table(p, 1, 1, avpriv_mjpeg_bits_ac_chrominance, avpriv_mjpeg_val_ac_chrominance); AV_WB16(ptr, size); } |