[Ffmpeg-cvslog] r5526 - in trunk: libavcodec/adx.c libavcodec/avcodec.h libavformat/avformat.h libavformat/utils.c

[lu_zero]

Author: lu_zero
Date: Sun Jun 25 19:37:12 2006
New Revision: 5526

Modified:
   trunk/libavcodec/adx.c
   trunk/libavcodec/avcodec.h
   trunk/libavformat/avformat.h
   trunk/libavformat/utils.c

Log:
cleanup patch from Diego Petten? <flameeyes at gentoo.org>

Modified: trunk/libavcodec/adx.c
==============================================================================
--- trunk/libavcodec/adx.c	(original)
+++ trunk/libavcodec/adx.c	Sun Jun 25 19:37:12 2006
@@ -267,7 +267,7 @@
     return (p[0]<<24)|(p[1]<<16)|(p[2]<<8)|p[3];
 }
 
-int is_adx(const unsigned char *buf,size_t bufsize)
+static int is_adx(const unsigned char *buf,size_t bufsize)
 {
     int    offset;
 

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Sun Jun 25 19:37:12 2006
@@ -2530,9 +2530,6 @@
 void *av_mallocz_static(unsigned int size);
 void *av_realloc_static(void *ptr, unsigned int size);
 
-/* add by bero : in adx.c */
-int is_adx(const unsigned char *buf,size_t bufsize);
-
 void img_copy(AVPicture *dst, const AVPicture *src,
               int pix_fmt, int width, int height);
 

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	(original)
+++ trunk/libavformat/avformat.h	Sun Jun 25 19:37:12 2006
@@ -81,10 +81,6 @@
     int64_t val, num, den;
 } AVFrac;
 
-void av_frac_init(AVFrac *f, int64_t val, int64_t num, int64_t den);
-void av_frac_add(AVFrac *f, int64_t incr);
-void av_frac_set(AVFrac *f, int64_t val);
-
 /*************************************************/
 /* input/output formats */
 

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Sun Jun 25 19:37:12 2006
@@ -26,6 +26,10 @@
  * Various utility functions for using ffmpeg library.
  */
 
+static void av_frac_init(AVFrac *f, int64_t val, int64_t num, int64_t den);
+static void av_frac_add(AVFrac *f, int64_t incr);
+static void av_frac_set(AVFrac *f, int64_t val);
+
 /** head of registered input format linked list. */
 AVInputFormat *first_iformat = NULL;
 /** head of registered output format linked list. */
@@ -3147,7 +3151,7 @@
  * @param num must be >= 0
  * @param den must be >= 1
  */
-void av_frac_init(AVFrac *f, int64_t val, int64_t num, int64_t den)
+static void av_frac_init(AVFrac *f, int64_t val, int64_t num, int64_t den)
 {
     num += (den >> 1);
     if (num >= den) {
@@ -3162,7 +3166,7 @@
 /**
  * Set f to (val + 0.5).
  */
-void av_frac_set(AVFrac *f, int64_t val)
+static void av_frac_set(AVFrac *f, int64_t val)
 {
     f->val = val;
     f->num = f->den >> 1;
@@ -3174,7 +3178,7 @@
  * @param f fractional number
  * @param incr increment, can be positive or negative
  */
-void av_frac_add(AVFrac *f, int64_t incr)
+static void av_frac_add(AVFrac *f, int64_t incr)
 {
     int64_t num, den;