mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
Originally committed as revision 4597 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
2118901192
commit
344b825ceb
@ -37,7 +37,7 @@ void align_put_bits(PutBitContext *s)
|
||||
#endif
|
||||
}
|
||||
|
||||
void put_string(PutBitContext * pbc, char *s, int put_zero)
|
||||
void ff_put_string(PutBitContext * pbc, char *s, int put_zero)
|
||||
{
|
||||
while(*s){
|
||||
put_bits(pbc, 8, *s);
|
||||
|
@ -95,7 +95,7 @@ static inline void flush_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 */
|
||||
/* buffer, buffer_end and size_in_bits must be present and used by every reader */
|
||||
|
@ -2396,7 +2396,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
|
||||
if(!(s->flags & CODEC_FLAG_BITEXACT)){
|
||||
put_bits(&s->pb, 16, 0);
|
||||
put_bits(&s->pb, 16, 0x1B2); /* user_data */
|
||||
put_string(&s->pb, LIBAVCODEC_IDENT, 0);
|
||||
ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -380,7 +380,7 @@ static void jpeg_put_comments(MpegEncContext *s)
|
||||
/* JFIF header */
|
||||
put_marker(p, APP0);
|
||||
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, 8, 0); /* units type: 0 - aspect ratio */
|
||||
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);
|
||||
ptr = pbBufPtr(p);
|
||||
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;
|
||||
ptr[0] = size >> 8;
|
||||
ptr[1] = size;
|
||||
@ -408,7 +408,7 @@ static void jpeg_put_comments(MpegEncContext *s)
|
||||
flush_put_bits(p);
|
||||
ptr = pbBufPtr(p);
|
||||
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;
|
||||
ptr[0] = size >> 8;
|
||||
ptr[1] = size;
|
||||
|
Loading…
Reference in New Issue
Block a user