[FFmpeg-cvslog] lavf: use avpriv_ prefix for ff_new_chapter().
Anton Khirnov
git at videolan.org
Fri Oct 21 02:37:10 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Oct 17 08:58:50 2011 +0200| [1fa395e471d563166f3fe3071fce8148e27679a8] | committer: Anton Khirnov
lavf: use avpriv_ prefix for ff_new_chapter().
It's used in libavdevice.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fa395e471d563166f3fe3071fce8148e27679a8
---
libavdevice/libcdio.c | 2 +-
libavformat/asfdec.c | 2 +-
libavformat/ffmetadec.c | 2 +-
libavformat/internal.h | 4 ++--
libavformat/matroskadec.c | 2 +-
libavformat/mov.c | 4 ++--
libavformat/nutdec.c | 2 +-
libavformat/oggparsevorbis.c | 2 +-
libavformat/utils.c | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index bade74e..6d0671a 100644
--- a/libavdevice/libcdio.c
+++ b/libavdevice/libcdio.c
@@ -97,7 +97,7 @@ static av_cold int read_header(AVFormatContext *ctx, AVFormatParameters *ap)
for (i = 0; i < s->drive->tracks; i++) {
char title[16];
snprintf(title, sizeof(title), "track %02d", s->drive->disc_toc[i].bTrack);
- ff_new_chapter(ctx, i, st->time_base, s->drive->disc_toc[i].dwStartSector,
+ avpriv_new_chapter(ctx, i, st->time_base, s->drive->disc_toc[i].dwStartSector,
s->drive->disc_toc[i+1].dwStartSector, title);
}
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 48ecec7..88091a5 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -573,7 +573,7 @@ static int asf_read_marker(AVFormatContext *s, int64_t size)
name_len = avio_rl32(pb); // name length
if ((ret = avio_get_str16le(pb, name_len * 2, name, sizeof(name))) < name_len)
avio_skip(pb, name_len - ret);
- ff_new_chapter(s, i, (AVRational){1, 10000000}, pres_time, AV_NOPTS_VALUE, name );
+ avpriv_new_chapter(s, i, (AVRational){1, 10000000}, pres_time, AV_NOPTS_VALUE, name );
}
return 0;
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c
index b241515..21e5ee9 100644
--- a/libavformat/ffmetadec.c
+++ b/libavformat/ffmetadec.c
@@ -75,7 +75,7 @@ static AVChapter *read_chapter(AVFormatContext *s)
end = AV_NOPTS_VALUE;
}
- return ff_new_chapter(s, s->nb_chapters, tb, start, end, NULL);
+ return avpriv_new_chapter(s, s->nb_chapters, tb, start, end, NULL);
}
static uint8_t *unescape(uint8_t *buf, int size)
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 8440e6b..9ef9d64 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -225,8 +225,8 @@ int ff_add_index_entry(AVIndexEntry **index_entries,
*
* @return AVChapter or NULL on error
*/
-AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
- int64_t start, int64_t end, const char *title);
+AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base,
+ int64_t start, int64_t end, const char *title);
/**
* Ensure the index uses less memory than the maximum specified in
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 78b27b6..b3466db 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1599,7 +1599,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (chapters[i].start != AV_NOPTS_VALUE && chapters[i].uid
&& (max_start==0 || chapters[i].start > max_start)) {
chapters[i].chapter =
- ff_new_chapter(s, chapters[i].uid, (AVRational){1, 1000000000},
+ avpriv_new_chapter(s, chapters[i].uid, (AVRational){1, 1000000000},
chapters[i].start, chapters[i].end,
chapters[i].title);
av_dict_set(&chapters[i].chapter->metadata,
diff --git a/libavformat/mov.c b/libavformat/mov.c
index d93969c..62c3be3 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -287,7 +287,7 @@ static int mov_read_chpl(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_read(pb, str, str_len);
str[str_len] = 0;
- ff_new_chapter(c->fc, i, (AVRational){1,10000000}, start, AV_NOPTS_VALUE, str);
+ avpriv_new_chapter(c->fc, i, (AVRational){1,10000000}, start, AV_NOPTS_VALUE, str);
}
return 0;
}
@@ -2420,7 +2420,7 @@ static void mov_read_chapters(AVFormatContext *s)
}
}
- ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title);
+ avpriv_new_chapter(s, i, st->time_base, sample->timestamp, end, title);
av_freep(&title);
}
finish:
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 730d688..fb5ccf7 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -416,7 +416,7 @@ static int decode_info_header(NUTContext *nut){
if(chapter_id && !stream_id_plus1){
int64_t start= chapter_start / nut->time_base_count;
- chapter= ff_new_chapter(s, chapter_id,
+ chapter= avpriv_new_chapter(s, chapter_id,
nut->time_base[chapter_start % nut->time_base_count],
start, start + chapter_len, NULL);
metadata = &chapter->metadata;
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 86951f3..8a40697 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -45,7 +45,7 @@ static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)
if (sscanf(val, "%02d:%02d:%02d.%03d", &h, &m, &s, &ms) < 4)
return 0;
- ff_new_chapter(as, cnum, (AVRational){1,1000},
+ avpriv_new_chapter(as, cnum, (AVRational){1,1000},
ms + 1000*(s + 60*(m + 60*h)),
AV_NOPTS_VALUE, NULL);
av_free(val);
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5e3e60b..1c1a748 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2739,7 +2739,7 @@ AVProgram *av_new_program(AVFormatContext *ac, int id)
return program;
}
-AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base, int64_t start, int64_t end, const char *title)
+AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, int64_t start, int64_t end, const char *title)
{
AVChapter *chapter = NULL;
int i;
More information about the ffmpeg-cvslog
mailing list