aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-11-29 23:01:29 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-11-29 23:01:29 +0000
commit587edd6af8460282a436ad2e597c4bad7b32fe8e (patch)
tree9ed0c8818e0465f1ad39d6ab2b4651dd0bde2fc9
parent244c8d100a7bb7600a89319629df2d956b742c2c (diff)
downloadffmpeg-587edd6af8460282a436ad2e597c4bad7b32fe8e.tar.gz
Use more consistent / meaningful parameter names for the
ff_copy_bits() function. Originally committed as revision 20663 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/bitstream.c10
-rw-r--r--libavcodec/put_bits.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index d8d0f3c7be..9002830cec 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -47,14 +47,14 @@ void align_put_bits(PutBitContext *s)
#endif
}
-void ff_put_string(PutBitContext * pbc, const char *s, int terminate_string)
+void ff_put_string(PutBitContext *pb, const char *string, int terminate_string)
{
- while(*s){
- put_bits(pbc, 8, *s);
- s++;
+ while(*string){
+ put_bits(pb, 8, *string);
+ string++;
}
if(terminate_string)
- put_bits(pbc, 8, 0);
+ put_bits(pb, 8, 0);
}
void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length)
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index 72cd62f635..d16abfc56b 100644
--- a/libavcodec/put_bits.h
+++ b/libavcodec/put_bits.h
@@ -123,11 +123,11 @@ static inline void flush_put_bits(PutBitContext *s)
void align_put_bits(PutBitContext *s);
/**
- * Puts the string s in the bitstream.
+ * Puts the string string in the bitstream.
*
* @param terminate_string 0-terminates the written string if value is 1
*/
-void ff_put_string(PutBitContext * pbc, const char *s, int terminate_string);
+void ff_put_string(PutBitContext *pb, const char *string, int terminate_string);
/**
* Copies the content of src to the bitstream.