[FFmpeg-cvslog] rtjpeg: Add ff_ prefix to nonstatic symbols

Martin Storsjö git at videolan.org
Thu Feb 16 01:47:02 CET 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Feb 15 13:55:19 2012 +0200| [0ca1bdb37d3597f67b8547c262aaa5b82d4e563e] | committer: Martin Storsjö

rtjpeg: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ca1bdb37d3597f67b8547c262aaa5b82d4e563e
---

 libavcodec/nuv.c    |    8 ++++----
 libavcodec/rtjpeg.c |   12 ++++++------
 libavcodec/rtjpeg.h |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 631b2ed..84935b6 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -121,9 +121,9 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, int qualit
             av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
             return 0;
         }
-        rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
+        ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
     } else if (quality != c->quality)
-        rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
+        ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
     return 1;
 }
 
@@ -154,7 +154,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         ret = get_quant(avctx, c, buf, buf_size);
         if (ret < 0)
             return ret;
-        rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
+        ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
         return orig_size;
     }
 
@@ -224,7 +224,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         }
         case NUV_RTJPEG_IN_LZO:
         case NUV_RTJPEG: {
-            rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size);
+            ff_rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size);
             break;
         }
         case NUV_BLACK: {
diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c
index 2c5ef0a..3604585 100644
--- a/libavcodec/rtjpeg.c
+++ b/libavcodec/rtjpeg.c
@@ -97,15 +97,15 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc
 
 /**
  * @brief decode one rtjpeg YUV420 frame
- * @param c context, must be initialized via rtjpeg_decode_init
+ * @param c context, must be initialized via ff_rtjpeg_decode_init
  * @param f AVFrame to place decoded frame into. If parts of the frame
  *          are not coded they are left unchanged, so consider initializing it
  * @param buf buffer containing input data
  * @param buf_size length of input data in bytes
  * @return number of bytes consumed from the input buffer
  */
-int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
-                               const uint8_t *buf, int buf_size) {
+int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
+                                  const uint8_t *buf, int buf_size) {
     GetBitContext gb;
     int w = c->w / 16, h = c->h / 16;
     int x, y;
@@ -154,9 +154,9 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
  * @param lquant luma quantization table to use
  * @param cquant chroma quantization table to use
  */
-void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
-                        int width, int height,
-                        const uint32_t *lquant, const uint32_t *cquant) {
+void ff_rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
+                           int width, int height,
+                           const uint32_t *lquant, const uint32_t *cquant) {
     int i;
     c->dsp = dsp;
     for (i = 0; i < 64; i++) {
diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h
index d537c93..95b59e9 100644
--- a/libavcodec/rtjpeg.h
+++ b/libavcodec/rtjpeg.h
@@ -34,10 +34,10 @@ typedef struct {
     DECLARE_ALIGNED(16, DCTELEM, block)[64];
 } RTJpegContext;
 
-void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
+void ff_rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
                         int width, int height,
                         const uint32_t *lquant, const uint32_t *cquant);
 
-int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
+int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
                                const uint8_t *buf, int buf_size);
 #endif /* AVCODEC_RTJPEG_H */



More information about the ffmpeg-cvslog mailing list