10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.

Both libavformat and libavcodec requires this function.
pull/8/head
Clément Bœsch 12 years ago
parent 5c68aae908
commit 67286fa98b
  1. 2
      libavcodec/dvdsubenc.c
  2. 2
      libavcodec/internal.h
  3. 2
      libavcodec/utils.c
  4. 2
      libavformat/assdec.c
  5. 2
      libavformat/jacosubdec.c
  6. 2
      libavformat/samidec.c
  7. 2
      libavformat/subviewerdec.c

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

@ -204,6 +204,6 @@ int ff_codec_close_recursive(AVCodecContext *avctx);
/** /**
* Finalize buf into extradata and set its size appropriately. * 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 */ #endif /* AVCODEC_INTERNAL_H */

@ -2686,7 +2686,7 @@ int avcodec_is_open(AVCodecContext *s)
return !!s->internal; 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; int ret;
char *str; char *str;

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

@ -229,7 +229,7 @@ static int jacosub_read_header(AVFormatContext *s)
} }
/* general/essential directives in the extradata */ /* 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) if (ret < 0)
return ret; return ret;

@ -92,7 +92,7 @@ static int sami_read_header(AVFormatContext *s)
av_bprint_clear(&buf); 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) if (res < 0)
goto end; goto end;

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

Loading…
Cancel
Save