Mercurial > audlegacy-plugins
changeset 830:68562d99230f trunk
[svn] - more symbol cleanups.
| author | nenolod |
|---|---|
| date | Mon, 12 Mar 2007 15:23:10 -0700 |
| parents | 1c250e20c6e3 |
| children | dec0488e1344 |
| files | ChangeLog src/ffmpeg/libavcodec/bitstream.c src/ffmpeg/libavcodec/flac.c src/ffmpeg/libavcodec/shorten.c src/ffmpeg/libavformat/aviobuf.c src/ffmpeg/libavformat/dsicin.c src/ffmpeg/libavformat/raw.c src/ffmpeg/libavformat/utils.c |
| diffstat | 8 files changed, 34 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 12 15:15:54 2007 -0700 +++ b/ChangeLog Mon Mar 12 15:23:10 2007 -0700 @@ -1,3 +1,14 @@ +2007-03-12 22:15:54 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [1758] + - more video demuxing removed + + trunk/src/ffmpeg/Makefile | 5 + trunk/src/ffmpeg/libavformat/img.c | 400 ----------------------- + trunk/src/ffmpeg/libavformat/v4l2.c | 541 -------------------------------- + trunk/src/ffmpeg/libavformat/yuv4mpeg.c | 408 ------------------------ + 4 files changed, 1 insertion(+), 1353 deletions(-) + + 2007-03-12 22:05:25 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [1756] - more stuff to kill
--- a/src/ffmpeg/libavcodec/bitstream.c Mon Mar 12 15:15:54 2007 -0700 +++ b/src/ffmpeg/libavcodec/bitstream.c Mon Mar 12 15:23:10 2007 -0700 @@ -77,12 +77,8 @@ vlc->table_size += size; if (vlc->table_size > vlc->table_allocated) { vlc->table_allocated += (1 << vlc->bits); - if(use_static) - vlc->table = av_realloc_static(vlc->table, - sizeof(VLC_TYPE) * 2 * vlc->table_allocated); - else - vlc->table = av_realloc(vlc->table, - sizeof(VLC_TYPE) * 2 * vlc->table_allocated); + vlc->table = av_realloc(vlc->table, + sizeof(VLC_TYPE) * 2 * vlc->table_allocated); if (!vlc->table) return -1; }
--- a/src/ffmpeg/libavcodec/flac.c Mon Mar 12 15:15:54 2007 -0700 +++ b/src/ffmpeg/libavcodec/flac.c Mon Mar 12 15:23:10 2007 -0700 @@ -135,7 +135,7 @@ s->decoded[i] = av_realloc(s->decoded[i], sizeof(int32_t)*s->max_blocksize); } - s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize); + s->bitstream= av_realloc(s->bitstream, s->max_framesize); } static void metadata_streaminfo(FLACContext *s) @@ -534,7 +534,7 @@ if(s->max_framesize == 0){ s->max_framesize= 65536; // should hopefully be enough for the first header - s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize); + s->bitstream= av_realloc(s->bitstream, s->max_framesize); } if(1 && s->max_framesize){//FIXME truncated
--- a/src/ffmpeg/libavcodec/shorten.c Mon Mar 12 15:15:54 2007 -0700 +++ b/src/ffmpeg/libavcodec/shorten.c Mon Mar 12 15:23:10 2007 -0700 @@ -275,7 +275,7 @@ int16_t *samples = data; if(s->max_framesize == 0){ s->max_framesize= 1024; // should hopefully be enough for the first header - s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize); + s->bitstream= av_realloc(s->bitstream, s->max_framesize); } if(1 && s->max_framesize){//FIXME truncated
--- a/src/ffmpeg/libavformat/aviobuf.c Mon Mar 12 15:15:54 2007 -0700 +++ b/src/ffmpeg/libavformat/aviobuf.c Mon Mar 12 15:23:10 2007 -0700 @@ -478,6 +478,14 @@ } } +void put_le32(ByteIOContext *s, unsigned int val) +{ + put_byte(s, val); + put_byte(s, val >> 8); + put_byte(s, val >> 16); + put_byte(s, val >> 24); +} + void put_be32(ByteIOContext *s, unsigned int val) { put_byte(s, val >> 24);
--- a/src/ffmpeg/libavformat/dsicin.c Mon Mar 12 15:15:54 2007 -0700 +++ b/src/ffmpeg/libavformat/dsicin.c Mon Mar 12 15:23:10 2007 -0700 @@ -149,7 +149,7 @@ hdr->video_frame_size = get_le32(pb); hdr->audio_frame_size = get_le32(pb); - if (url_feof(pb) || url_ferror(pb)) + if (url_feof(pb) /*|| url_ferror(pb) */) return AVERROR_IO; if (get_le32(pb) != 0xAA55AA55)
--- a/src/ffmpeg/libavformat/raw.c Mon Mar 12 15:15:54 2007 -0700 +++ b/src/ffmpeg/libavformat/raw.c Mon Mar 12 15:23:10 2007 -0700 @@ -737,56 +737,6 @@ PCMDEF(alaw, "pcm A law format", "al", CODEC_ID_PCM_ALAW) -static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) -{ - int packet_size, ret, width, height; - AVStream *st = s->streams[0]; - - width = st->codec->width; - height = st->codec->height; - - packet_size = avpicture_get_size(st->codec->pix_fmt, width, height); - if (packet_size < 0) - return -1; - - ret= av_get_packet(&s->pb, pkt, packet_size); - - pkt->stream_index = 0; - if (ret != packet_size) { - return AVERROR_IO; - } else { - return 0; - } -} - -AVInputFormat rawvideo_demuxer = { - "rawvideo", - "raw video format", - 0, - NULL, - raw_read_header, - rawvideo_read_packet, - raw_read_close, - .extensions = "yuv,cif,qcif", - .value = CODEC_ID_RAWVIDEO, -}; - -#ifdef CONFIG_MUXERS -AVOutputFormat rawvideo_muxer = { - "rawvideo", - "raw video format", - NULL, - "yuv", - 0, - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - raw_write_header, - raw_write_packet, - raw_write_trailer, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif //CONFIG_MUXERS - #ifdef CONFIG_MUXERS static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt) {
--- a/src/ffmpeg/libavformat/utils.c Mon Mar 12 15:15:54 2007 -0700 +++ b/src/ffmpeg/libavformat/utils.c Mon Mar 12 15:23:10 2007 -0700 @@ -1134,8 +1134,7 @@ if((unsigned)st->nb_index_entries + 1 >= UINT_MAX / sizeof(AVIndexEntry)) return -1; - entries = av_fast_realloc(st->index_entries, - &st->index_entries_allocated_size, + entries = av_realloc(st->index_entries, (st->nb_index_entries + 1) * sizeof(AVIndexEntry)); if(!entries) @@ -2391,8 +2390,10 @@ truncate_ts(s->streams[pkt->stream_index], pkt); ret= s->oformat->write_packet(s, pkt); +#if 0 if(!ret) ret= url_ferror(&s->pb); +#endif return ret; } @@ -2521,8 +2522,10 @@ if(ret<0) return ret; +#if 0 if(url_ferror(&s->pb)) return url_ferror(&s->pb); +#endif } } @@ -2552,15 +2555,19 @@ if(ret<0) goto fail; +#if 0 if(url_ferror(&s->pb)) goto fail; +#endif } if(s->oformat->write_trailer) ret = s->oformat->write_trailer(s); fail: +#if 0 if(ret == 0) ret=url_ferror(&s->pb); +#endif for(i=0;i<s->nb_streams;i++) av_freep(&s->streams[i]->priv_data); av_freep(&s->priv_data);