add proper prefix to new mjpeg extern func/var

Originally committed as revision 9049 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 25 insertions, 21 deletions

diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 11967fe01a..53aae5c287 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -67,22 +67,22 @@ int mjpeg_init(MpegEncContext *s)
     s->max_qcoeff= 1023;
 
     /* build all the huffman tables */
-    build_huffman_codes(m->huff_size_dc_luminance,
-                        m->huff_code_dc_luminance,
-                        bits_dc_luminance,
-                        val_dc_luminance);
-    build_huffman_codes(m->huff_size_dc_chrominance,
-                        m->huff_code_dc_chrominance,
-                        bits_dc_chrominance,
-                        val_dc_chrominance);
-    build_huffman_codes(m->huff_size_ac_luminance,
-                        m->huff_code_ac_luminance,
-                        bits_ac_luminance,
-                        val_ac_luminance);
-    build_huffman_codes(m->huff_size_ac_chrominance,
-                        m->huff_code_ac_chrominance,
-                        bits_ac_chrominance,
-                        val_ac_chrominance);
+    ff_mjpeg_build_huffman_codes(m->huff_size_dc_luminance,
+                                 m->huff_code_dc_luminance,
+                                 ff_mjpeg_bits_dc_luminance,
+                                 ff_mjpeg_val_dc_luminance);
+    ff_mjpeg_build_huffman_codes(m->huff_size_dc_chrominance,
+                                 m->huff_code_dc_chrominance,
+                                 ff_mjpeg_bits_dc_chrominance,
+                                 ff_mjpeg_val_dc_chrominance);
+    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);
+    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);
 
     s->mjpeg_ctx = m;
     return 0;
@@ -149,11 +149,15 @@ static void jpeg_table_header(MpegEncContext *s)
     ptr = pbBufPtr(p);
     put_bits(p, 16, 0); /* patched later */
     size = 2;
-    size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance);
-    size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance);
-
-    size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance);
-    size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance);
+    size += put_huffman_table(s, 0, 0, ff_mjpeg_bits_dc_luminance,
+                              ff_mjpeg_val_dc_luminance);
+    size += put_huffman_table(s, 0, 1, ff_mjpeg_bits_dc_chrominance,
+                              ff_mjpeg_val_dc_chrominance);
+
+    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);
     ptr[0] = size >> 8;
     ptr[1] = size;
 }