RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc: use avpriv_ prefix for some dv symbols used in lavf. 

Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
This commit is contained in:
Anton Khirnov 2011-10-17 09:28:53 +02:00
parent d9cca9fc6a
commit 242c73a0fd
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dv.c
View File

@ -349,7 +349,7 @@ static av_cold int dvvideo_init(AVCodecContext *avctx)
static av_cold int dvvideo_init_encoder(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", 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)); avctx->width, avctx->height, av_get_pix_fmt_name(avctx->pix_fmt));
return -1; return -1;
@ -1072,7 +1072,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
const uint8_t* vsc_pack; const uint8_t* vsc_pack;
int apt, is16_9; 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)) { 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"); av_log(avctx, AV_LOG_ERROR, "could not find dv frame profile\n");
return -1; /* NOTE: we only accept several full frames */ 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; 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)) if (!s->sys || buf_size < s->sys->frame_size || dv_init_dynamic_tables(s->sys))
return -1; return -1;

4
libavcodec/dvdata.c
View File

@ -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) const uint8_t* frame, unsigned buf_size)
{ {
int i; int i;
@ -270,7 +270,7 @@ const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
return NULL; return NULL;
} }
const DVprofile* ff_dv_codec_profile(AVCodecContext* codec) const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec)
{ {
int i; int i;

6
libavcodec/dvdata.h
View File

@ -274,9 +274,9 @@ enum dv_pack_type {
*/ */
#define DV_MAX_BPM 8 #define DV_MAX_BPM 8
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); const uint8_t* frame, unsigned buf_size);
const DVprofile* ff_dv_codec_profile(AVCodecContext* codec); const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec);
static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num, static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num,
uint8_t seq_num, uint8_t dif_num, uint8_t seq_num, uint8_t dif_num,

6
libavformat/dv.c
View File

@ -323,7 +323,7 @@ int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,
uint8_t *ppcm[4] = {0}; uint8_t *ppcm[4] = {0};
if (buf_size < DV_PROFILE_BYTES || 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) { buf_size < c->sys->frame_size) {
return -1; /* Broken frame, or not enough data */ 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) int64_t timestamp, int flags)
{ {
// FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk) // 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 offset;
int64_t size = avio_size(s->pb) - s->data_offset; int64_t size = avio_size(s->pb) - s->data_offset;
int64_t max_offset = ((size-1) / sys->frame_size) * sys->frame_size; 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) avio_seek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0)
return AVERROR(EIO); 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) { if (!c->dv_demux->sys) {
av_log(s, AV_LOG_ERROR, "Can't determine profile of DV input stream.\n"); av_log(s, AV_LOG_ERROR, "Can't determine profile of DV input stream.\n");
return -1; return -1;

2
libavformat/dvenc.c
View File

@ -325,7 +325,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
c->ast[i]->codec->channels != 2)) c->ast[i]->codec->channels != 2))
goto bail_out; goto bail_out;
} }
c->sys = ff_dv_codec_profile(vst->codec); c->sys = avpriv_dv_codec_profile(vst->codec);
if (!c->sys) if (!c->sys)
goto bail_out; goto bail_out;