Use a more explicit "codec" rather than "format" as the parameter of

register_avcodec().

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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5ec0d1c9baa77299d6bf6fa116ec1c4e667bce54..ffc08f50e688cb9afb1b9cae37ef12d83447db99 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2563,7 +2563,7 @@ unsigned avcodec_version(void);
  */
 void avcodec_init(void);
 
-void register_avcodec(AVCodec *format);
+void register_avcodec(AVCodec *codec);
 
 /**
  * Finds a registered encoder with a matching codec ID.

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 9b16571f564f654c60d47f15be1c64db2b61c751..755af1ac62e4ee2665b948f1bac2e612c207fb2d 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -87,13 +87,13 @@ AVCodec *av_codec_next(AVCodec *c){
     else  return first_avcodec;
 }
 
-void register_avcodec(AVCodec *format)
+void register_avcodec(AVCodec *codec)
 {
     AVCodec **p;
     p = &first_avcodec;
     while (*p != NULL) p = &(*p)->next;
-    *p = format;
-    format->next = NULL;
+    *p = codec;
+    codec->next = NULL;
 }
 
 void avcodec_set_dimensions(AVCodecContext *s, int width, int height){