diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-17 09:28:53 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-20 21:06:58 +0200 |
| commit | 242c73a0fd664be8fc1d69cc3e383c13524914b5 (patch) | |
| tree | b1933dfea43e3919e183aa490b6400d6634de0ea /libavformat | |
| parent | d9cca9fc6a4796c0a4235b25f5f7fd7191813f3a (diff) | |
| download | ffmpeg-242c73a0fd664be8fc1d69cc3e383c13524914b5.tar.gz | |
lavc: use avpriv_ prefix for some dv symbols used in lavf.
Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/dv.c | 6 | ||||
| -rw-r--r-- | libavformat/dvenc.c | 2 |
2 files changed, 4 insertions, 4 deletions
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; |