virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avio: add av_put_str and deprecate put_strz in favor of it

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4efd5cf34b)
This commit is contained in:
Anton Khirnov 2011-01-21 19:18:07 +00:00 committed by Michael Niedermayer
parent 384dbd617f
commit e910a77b0d
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avienc.c
View File

@ -109,7 +109,7 @@ static void avi_write_info_tag(ByteIOContext *pb, const char *tag, const char *s
len++;
put_tag(pb, tag);
put_le32(pb, len);
put_strz(pb, str);
avio_put_str(pb, str);
if (len & 1)
put_byte(pb, 0);
}

10
libavformat/avio.h
View File

@ -367,7 +367,15 @@ void put_le16(ByteIOContext *s, unsigned int val);
void put_be16(ByteIOContext *s, unsigned int val);
void put_tag(ByteIOContext *s, const char *tag);
void put_strz(ByteIOContext *s, const char *buf);
#if FF_API_OLD_AVIO
attribute_deprecated void put_strz(ByteIOContext *s, const char *buf);
#endif
/**
* Write a NULL-terminated string.
* @return number of bytes written.
*/
int avio_put_str(ByteIOContext *s, const char *str);
/**
* fseek() equivalent for ByteIOContext.

16
libavformat/aviobuf.c
View File

@ -265,12 +265,22 @@ void put_be32(ByteIOContext *s, unsigned int val)
put_byte(s, val);
}
#if FF_API_OLD_AVIO
void put_strz(ByteIOContext *s, const char *str)
{
if (str)
put_buffer(s, (const unsigned char *) str, strlen(str) + 1);
else
avio_put_str(s, str);
}
#endif
int avio_put_str(ByteIOContext *s, const char *str)
{
int len = 1;
if (str) {
len += strlen(str);
put_buffer(s, (const unsigned char *) str, len);
} else
put_byte(s, 0);
return len;
}
int ff_get_v_length(uint64_t val){

2
libavformat/ffmenc.c
View File

@ -132,7 +132,7 @@ static int ffm_write_header(AVFormatContext *s)
put_be16(pb, (int) (codec->qcompress * 10000.0));
put_be16(pb, (int) (codec->qblur * 10000.0));
put_be32(pb, codec->bit_rate_tolerance);
put_strz(pb, codec->rc_eq ? codec->rc_eq : "tex^qComp");
avio_put_str(pb, codec->rc_eq ? codec->rc_eq : "tex^qComp");
put_be32(pb, codec->rc_max_rate);
put_be32(pb, codec->rc_min_rate);
put_be32(pb, codec->rc_buffer_size);

3
libavformat/version.h
View File

@ -86,5 +86,8 @@
#ifndef FF_API_SYMVER
#define FF_API_SYMVER (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_OLD_AVIO
#define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
#endif //AVFORMAT_VERSION_H