RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

10l: export ff_bprint_to_extradata between libs using avpriv_ prefix. 

Both libavformat and libavcodec requires this function.
This commit is contained in:
Clément Bœsch 2012-12-30 22:54:53 +01:00
parent 5c68aae908
commit 67286fa98b
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dvdsubenc.c
View File

@ -409,7 +409,7 @@ static int dvdsub_init(AVCodecContext *avctx)
av_bprintf(&extradata, " %06"PRIx32"%c",
dvdc->global_palette[i] & 0xFFFFFF, i < 15 ? ',' : '\n');
ret = ff_bprint_to_extradata(avctx, &extradata);
ret = avpriv_bprint_to_extradata(avctx, &extradata);
if (ret < 0)
return ret;

2
libavcodec/internal.h
View File

@ -204,6 +204,6 @@ int ff_codec_close_recursive(AVCodecContext *avctx);
/**
* Finalize buf into extradata and set its size appropriately.
*/
int ff_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf);
int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf);
#endif /* AVCODEC_INTERNAL_H */

2
libavcodec/utils.c
View File

@ -2686,7 +2686,7 @@ int avcodec_is_open(AVCodecContext *s)
return !!s->internal;
}
int ff_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf)
int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf)
{
int ret;
char *str;

2
libavformat/assdec.c
View File

@ -133,7 +133,7 @@ static int ass_read_header(AVFormatContext *s)
av_bprint_finalize(&line, NULL);
res = ff_bprint_to_extradata(st->codec, &header);
res = avpriv_bprint_to_extradata(st->codec, &header);
if (res < 0)
goto end;

2
libavformat/jacosubdec.c
View File

@ -229,7 +229,7 @@ static int jacosub_read_header(AVFormatContext *s)
}
/* general/essential directives in the extradata */
ret = ff_bprint_to_extradata(st->codec, &header);
ret = avpriv_bprint_to_extradata(st->codec, &header);
if (ret < 0)
return ret;

2
libavformat/samidec.c
View File

@ -92,7 +92,7 @@ static int sami_read_header(AVFormatContext *s)
av_bprint_clear(&buf);
}
res = ff_bprint_to_extradata(st->codec, &hdr_buf);
res = avpriv_bprint_to_extradata(st->codec, &hdr_buf);
if (res < 0)
goto end;

2
libavformat/subviewerdec.c
View File

@ -100,7 +100,7 @@ static int subviewer_read_header(AVFormatContext *s)
av_bprintf(&header, "%s", line);
if (!strncmp(line, "[END INFORMATION]", 17) || !strncmp(line, "[SUBTITLE]", 10)) {
/* end of header */
res = ff_bprint_to_extradata(st->codec, &header);
res = avpriv_bprint_to_extradata(st->codec, &header);
if (res < 0)
goto end;
} else if (strncmp(line, "[INFORMATION]", 13)) {