diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2012-09-06 15:50:20 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-09 22:22:07 +0300 |
| commit | a0845bae49a7ac9a7b33c846db457c471a6c8deb (patch) | |
| tree | 1ffbd2bba3f9ceb5c54a9c383c23d3da0b8b5997 /libavcodec/mjpegenc.c | |
| parent | 28165fee1bb155545b82c1537917083bac7813f7 (diff) | |
| download | ffmpeg-a0845bae49a7ac9a7b33c846db457c471a6c8deb.tar.gz | |
mjpeg: Rename some symbols to avpriv_* instead of ff_*
These symbols will be used from the RTP/JPEG depacketizer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/mjpegenc.c')
| -rw-r--r-- | libavcodec/mjpegenc.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 41f81af0e4..d369d36520 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -58,20 +58,20 @@ av_cold int ff_mjpeg_encode_init(MpegEncContext *s) /* build all the huffman tables */ ff_mjpeg_build_huffman_codes(m->huff_size_dc_luminance, m->huff_code_dc_luminance, - ff_mjpeg_bits_dc_luminance, - ff_mjpeg_val_dc); + avpriv_mjpeg_bits_dc_luminance, + avpriv_mjpeg_val_dc); ff_mjpeg_build_huffman_codes(m->huff_size_dc_chrominance, m->huff_code_dc_chrominance, - ff_mjpeg_bits_dc_chrominance, - ff_mjpeg_val_dc); + avpriv_mjpeg_bits_dc_chrominance, + avpriv_mjpeg_val_dc); ff_mjpeg_build_huffman_codes(m->huff_size_ac_luminance, m->huff_code_ac_luminance, - ff_mjpeg_bits_ac_luminance, - ff_mjpeg_val_ac_luminance); + avpriv_mjpeg_bits_ac_luminance, + avpriv_mjpeg_val_ac_luminance); ff_mjpeg_build_huffman_codes(m->huff_size_ac_chrominance, m->huff_code_ac_chrominance, - ff_mjpeg_bits_ac_chrominance, - ff_mjpeg_val_ac_chrominance); + avpriv_mjpeg_bits_ac_chrominance, + avpriv_mjpeg_val_ac_chrominance); s->mjpeg_ctx = m; return 0; @@ -138,15 +138,15 @@ 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, ff_mjpeg_bits_dc_luminance, - ff_mjpeg_val_dc); - size += put_huffman_table(s, 0, 1, ff_mjpeg_bits_dc_chrominance, - ff_mjpeg_val_dc); - - size += put_huffman_table(s, 1, 0, ff_mjpeg_bits_ac_luminance, - ff_mjpeg_val_ac_luminance); - size += put_huffman_table(s, 1, 1, ff_mjpeg_bits_ac_chrominance, - ff_mjpeg_val_ac_chrominance); + size += put_huffman_table(s, 0, 0, avpriv_mjpeg_bits_dc_luminance, + avpriv_mjpeg_val_dc); + size += put_huffman_table(s, 0, 1, avpriv_mjpeg_bits_dc_chrominance, + avpriv_mjpeg_val_dc); + + size += put_huffman_table(s, 1, 0, avpriv_mjpeg_bits_ac_luminance, + avpriv_mjpeg_val_ac_luminance); + size += put_huffman_table(s, 1, 1, avpriv_mjpeg_bits_ac_chrominance, + avpriv_mjpeg_val_ac_chrominance); AV_WB16(ptr, size); } |