Commit 67286fa9 authored by Clément Bœsch's avatar Clément Bœsch

10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.

Both libavformat and libavcodec requires this function.
parent 5c68aae9
......@@ -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;
......
......@@ -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 */
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment