opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.

Browse Source 
Originally committed as revision 4597 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2005-09-18 21:21:01 +00:00
parent 2118901192
commit 344b825ceb
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/bitstream.c
View File

@ -37,7 +37,7 @@ void align_put_bits(PutBitContext *s)
#endif #endif
} }
void put_string(PutBitContext * pbc, char *s, int put_zero) void ff_put_string(PutBitContext * pbc, char *s, int put_zero)
{ {
while(*s){ while(*s){
put_bits(pbc, 8, *s); put_bits(pbc, 8, *s);

2
libavcodec/bitstream.h
View File

@ -95,7 +95,7 @@ static inline void flush_put_bits(PutBitContext *s)
} }
void align_put_bits(PutBitContext *s); void align_put_bits(PutBitContext *s);
void put_string(PutBitContext * pbc, char *s, int put_zero); void ff_put_string(PutBitContext * pbc, char *s, int put_zero);
/* bit input */ /* bit input */
/* buffer, buffer_end and size_in_bits must be present and used by every reader */ /* buffer, buffer_end and size_in_bits must be present and used by every reader */

2
libavcodec/h263.c
View File

@ -2396,7 +2396,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
if(!(s->flags & CODEC_FLAG_BITEXACT)){ if(!(s->flags & CODEC_FLAG_BITEXACT)){
put_bits(&s->pb, 16, 0); put_bits(&s->pb, 16, 0);
put_bits(&s->pb, 16, 0x1B2); /* user_data */ put_bits(&s->pb, 16, 0x1B2); /* user_data */
put_string(&s->pb, LIBAVCODEC_IDENT, 0); ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0);
} }
} }

6
libavcodec/mjpeg.c
View File

@ -380,7 +380,7 @@ static void jpeg_put_comments(MpegEncContext *s)
/* JFIF header */ /* JFIF header */
put_marker(p, APP0); put_marker(p, APP0);
put_bits(p, 16, 16); put_bits(p, 16, 16);
put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ ff_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */
put_bits(p, 16, 0x0201); /* v 1.02 */ put_bits(p, 16, 0x0201); /* v 1.02 */
put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
put_bits(p, 16, s->avctx->sample_aspect_ratio.num); put_bits(p, 16, s->avctx->sample_aspect_ratio.num);
@ -395,7 +395,7 @@ static void jpeg_put_comments(MpegEncContext *s)
flush_put_bits(p); flush_put_bits(p);
ptr = pbBufPtr(p); ptr = pbBufPtr(p);
put_bits(p, 16, 0); /* patched later */ put_bits(p, 16, 0); /* patched later */
put_string(p, LIBAVCODEC_IDENT, 1); ff_put_string(p, LIBAVCODEC_IDENT, 1);
size = strlen(LIBAVCODEC_IDENT)+3; size = strlen(LIBAVCODEC_IDENT)+3;
ptr[0] = size >> 8; ptr[0] = size >> 8;
ptr[1] = size; ptr[1] = size;
@ -408,7 +408,7 @@ static void jpeg_put_comments(MpegEncContext *s)
flush_put_bits(p); flush_put_bits(p);
ptr = pbBufPtr(p); ptr = pbBufPtr(p);
put_bits(p, 16, 0); /* patched later */ put_bits(p, 16, 0); /* patched later */
put_string(p, "CS=ITU601", 1); ff_put_string(p, "CS=ITU601", 1);
size = strlen("CS=ITU601")+3; size = strlen("CS=ITU601")+3;
ptr[0] = size >> 8; ptr[0] = size >> 8;
ptr[1] = size; ptr[1] = size;