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 /libavcodec | |
| 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 'libavcodec')
| -rw-r--r-- | libavcodec/dv.c | 6 | ||||
| -rw-r--r-- | libavcodec/dvdata.c | 4 | ||||
| -rw-r--r-- | libavcodec/dvdata.h | 6 |
3 files changed, 8 insertions, 8 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, |