diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-10-16 07:55:57 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-10-16 07:55:57 +0000 |
| commit | c76911bd658377003293f65e3f83aed59029c624 (patch) | |
| tree | 6c40e4d0f9966e61a724e23aff4adf22ff5abb06 /libavformat | |
| parent | 046c40010390af94bf3379f7e1eff9b5a5ddd250 (diff) | |
| download | ffmpeg-c76911bd658377003293f65e3f83aed59029c624.tar.gz | |
Split parts of dvdata.h into dvdata.c, this ensures that things like
work_chunks_* and dv_idct_factor_* variables appear only once in the binary
instead of 3 times.
Saves 3264 bytes in .rodata and 312416 bytes in .bss on x86_64.
Originally committed as revision 20246 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 8e0a83492e..085e8d2d06 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -322,7 +322,7 @@ int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, uint8_t *ppcm[4] = {0}; if (buf_size < DV_PROFILE_BYTES || - !(c->sys = dv_frame_profile(c->sys, buf, buf_size)) || + !(c->sys = ff_dv_frame_profile(c->sys, buf, buf_size)) || buf_size < c->sys->frame_size) { return -1; /* Broken frame, or not enough data */ } @@ -368,7 +368,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 = dv_codec_profile(c->vst->codec); + const DVprofile* sys = ff_dv_codec_profile(c->vst->codec); int64_t offset; int64_t size = url_fsize(s->pb); int64_t max_offset = ((size-1) / sys->frame_size) * sys->frame_size; @@ -431,7 +431,7 @@ static int dv_read_header(AVFormatContext *s, url_fseek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0) return AVERROR(EIO); - c->dv_demux->sys = dv_frame_profile(c->dv_demux->sys, c->buf, DV_PROFILE_BYTES); + c->dv_demux->sys = ff_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 c87697dd13..351062b76a 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -321,7 +321,7 @@ DVMuxContext* dv_init_mux(AVFormatContext* s) c->ast[i]->codec->channels != 2)) goto bail_out; } - c->sys = dv_codec_profile(vst->codec); + c->sys = ff_dv_codec_profile(vst->codec); if (!c->sys) goto bail_out; |