mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.
Both libavformat and libavcodec requires this function.
This commit is contained in:
parent
5c68aae908
commit
67286fa98b
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user