aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-10-17 09:28:53 +0200
committerAnton Khirnov <anton@khirnov.net>2011-10-20 21:06:58 +0200
commit242c73a0fd664be8fc1d69cc3e383c13524914b5 (patch)
treeb1933dfea43e3919e183aa490b6400d6634de0ea
parentd9cca9fc6a4796c0a4235b25f5f7fd7191813f3a (diff)
downloadffmpeg-242c73a0fd664be8fc1d69cc3e383c13524914b5.tar.gz
lavc: use avpriv_ prefix for some dv symbols used in lavf.
Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
-rw-r--r--libavcodec/dv.c6
-rw-r--r--libavcodec/dvdata.c4
-rw-r--r--libavcodec/dvdata.h6
-rw-r--r--libavformat/dv.c6
-rw-r--r--libavformat/dvenc.c2
5 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 976242235b..f16ed624e7 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -349,7 +349,7 @@ static av_cold int dvvideo_init(AVCodecContext *avctx)
static av_cold int dvvideo_init_encoder(AVCodecContext *avctx)
{
- if (!ff_dv_codec_profile(avctx)) {
+ if (!avpriv_dv_codec_profile(avctx)) {
av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video\n",
avctx->width, avctx->height, av_get_pix_fmt_name(avctx->pix_fmt));
return -1;
@@ -1072,7 +1072,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
const uint8_t* vsc_pack;
int apt, is16_9;
- s->sys = ff_dv_frame_profile(s->sys, buf, buf_size);
+ s->sys = avpriv_dv_frame_profile(s->sys, buf, buf_size);
if (!s->sys || buf_size < s->sys->frame_size || dv_init_dynamic_tables(s->sys)) {
av_log(avctx, AV_LOG_ERROR, "could not find dv frame profile\n");
return -1; /* NOTE: we only accept several full frames */
@@ -1245,7 +1245,7 @@ static int dvvideo_encode_frame(AVCodecContext *c, uint8_t *buf, int buf_size,
{
DVVideoContext *s = c->priv_data;
- s->sys = ff_dv_codec_profile(c);
+ s->sys = avpriv_dv_codec_profile(c);
if (!s->sys || buf_size < s->sys->frame_size || dv_init_dynamic_tables(s->sys))
return -1;
diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index a80d2da803..3a135a9ac7 100644
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -245,7 +245,7 @@ static const DVprofile dv_profiles[] = {
}
};
-const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
+const DVprofile* avpriv_dv_frame_profile(const DVprofile *sys,
const uint8_t* frame, unsigned buf_size)
{
int i;
@@ -270,7 +270,7 @@ const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
return NULL;
}
-const DVprofile* ff_dv_codec_profile(AVCodecContext* codec)
+const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec)
{
int i;
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 817b50639f..b2fb127ae6 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -274,9 +274,9 @@ enum dv_pack_type {
*/
#define DV_MAX_BPM 8
-const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
- const uint8_t* frame, unsigned buf_size);
-const DVprofile* ff_dv_codec_profile(AVCodecContext* codec);
+const DVprofile* avpriv_dv_frame_profile(const DVprofile *sys,
+ const uint8_t* frame, unsigned buf_size);
+const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec);
static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num,
uint8_t seq_num, uint8_t dif_num,
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 5b6fb6210b..2813bc3b67 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -323,7 +323,7 @@ int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,
uint8_t *ppcm[4] = {0};
if (buf_size < DV_PROFILE_BYTES ||
- !(c->sys = ff_dv_frame_profile(c->sys, buf, buf_size)) ||
+ !(c->sys = avpriv_dv_frame_profile(c->sys, buf, buf_size)) ||
buf_size < c->sys->frame_size) {
return -1; /* Broken frame, or not enough data */
}
@@ -369,7 +369,7 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c,
int64_t timestamp, int flags)
{
// FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk)
- const DVprofile* sys = ff_dv_codec_profile(c->vst->codec);
+ const DVprofile* sys = avpriv_dv_codec_profile(c->vst->codec);
int64_t offset;
int64_t size = avio_size(s->pb) - s->data_offset;
int64_t max_offset = ((size-1) / sys->frame_size) * sys->frame_size;
@@ -432,7 +432,7 @@ static int dv_read_header(AVFormatContext *s,
avio_seek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0)
return AVERROR(EIO);
- c->dv_demux->sys = ff_dv_frame_profile(c->dv_demux->sys, c->buf, DV_PROFILE_BYTES);
+ c->dv_demux->sys = avpriv_dv_frame_profile(c->dv_demux->sys, c->buf, DV_PROFILE_BYTES);
if (!c->dv_demux->sys) {
av_log(s, AV_LOG_ERROR, "Can't determine profile of DV input stream.\n");
return -1;
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 5c55338e2c..bffad44b9f 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -325,7 +325,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
c->ast[i]->codec->channels != 2))
goto bail_out;
}
- c->sys = ff_dv_codec_profile(vst->codec);
+ c->sys = avpriv_dv_codec_profile(vst->codec);
if (!c->sys)
goto bail_out;