Rename the 'put_zero' parameter of ff_put_string() to

'terminate_string'.

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

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 5d9bd32..4851098 100644 (file)
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -65,13 +65,13 @@ void align_put_bits(PutBitContext *s)
 #endif
 }
 
-void ff_put_string(PutBitContext * pbc, const char *s, int put_zero)
+void ff_put_string(PutBitContext * pbc, const char *s, int terminate_string)
 {
     while(*s){
         put_bits(pbc, 8, *s);
         s++;
     }
-    if(put_zero)
+    if(terminate_string)
         put_bits(pbc, 8, 0);
 }
 

diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 66a5498..519c188 100644 (file)
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -159,7 +159,7 @@ static inline void flush_put_bits(PutBitContext *s)
  * Pads the bitstream with zeros up to the next byte boundary.
  */
 void align_put_bits(PutBitContext *s);
-void ff_put_string(PutBitContext * pbc, const char *s, int put_zero);
+void ff_put_string(PutBitContext * pbc, const char *s, int terminate_string);
 
 /**
  * Copies the content of \p src to the bitstream.