diff options
author | Mike Melanson <mike@multimedia.cx> | 2004-06-19 18:51:46 +0400 |
---|---|---|
committer | Mike Melanson <mike@multimedia.cx> | 2004-06-19 18:51:46 +0400 |
commit | 9be653d0e995d01155528ed0d0d01894f52ae047 (patch) | |
tree | 1922fdccc8da517b5187ed5dd24bbdbdcb63085e | |
parent | 0bd586c50dc27ec38ca94e58f50030544d729463 (diff) |
cvs diff before cvs commit
Originally committed as revision 3240 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavformat/ipmovie.c | 2 | ||||
-rw-r--r-- | libavformat/mpeg.c | 8 | ||||
-rw-r--r-- | libavformat/raw.c | 71 |
3 files changed, 1 insertions, 80 deletions
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 017466d07c..fc176fd633 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -34,7 +34,7 @@ /* debugging support: #define DEBUG_IPMOVIE as non-zero to see extremely * verbose information about the demux process */ -#define DEBUG_IPMOVIE 1 +#define DEBUG_IPMOVIE 0 #if DEBUG_IPMOVIE #define debug_ipmovie printf diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index a478782dd4..dd4e524111 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -1351,14 +1351,6 @@ static int mpegps_read_packet(AVFormatContext *s, pkt->stream_index, pkt->pts / 90000.0, pkt->dts / 90000.0); #endif -#if 1 -//#ifdef CONFIG_ADX - if (codec_id == CODEC_ID_MP2 && is_adx(pkt->data,pkt->size)) { -printf ("found ADX...\n"); - st->codec.codec_id = CODEC_ID_ADPCM_ADX; - } -#endif //CONFIG_ADX - return 0; } diff --git a/libavformat/raw.c b/libavformat/raw.c index adcc2fd161..9a79ac7b06 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -601,73 +601,6 @@ AVOutputFormat null_oformat = { }; #endif //CONFIG_ENCODERS -static int adx_probe(AVProbeData *p) -{ - if (is_adx(p->buf,p->buf_size)) - return 100; - return 0; -} - -static int adx_read_header(AVFormatContext *s, - AVFormatParameters *ap) -{ - AVStream *st; - - st = av_new_stream(s, 0); - if (!st) - return AVERROR_NOMEM; - - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_id = CODEC_ID_ADPCM_ADX; - /* the parameters will be extracted from the compressed bitstream */ - return 0; -} - -AVInputFormat adx_iformat = { - "adx", - "SEGA CRI ADX audio", - 0, - adx_probe, - adx_read_header, - raw_read_packet, - raw_read_close, - .extensions = "adx", //FIXME remove after writing mpeg4_probe -}; - -#ifdef CONFIG_ENCODERS - -static int adx_write_trailer(AVFormatContext *s) -{ - ByteIOContext *pb = &s->pb; - offset_t file_size; - - if (!url_is_streamed(&s->pb)) { - /* update file size */ - file_size = url_ftell(pb); - url_fseek(pb, 0, SEEK_SET); - put_be32(pb, (uint32_t)(file_size - 8)); - url_fseek(pb, file_size, SEEK_SET); - - put_flush_packet(pb); - } - return 0; -} - -AVOutputFormat adx_oformat = { - "adx", - "SEGA CRI ADX audio", - NULL, - "adx", - 0, - CODEC_ID_ADPCM_ADX, - 0, - raw_write_header, - raw_write_packet, - raw_write_trailer, -}; -#endif //CONFIG_ENCODERS - - #ifndef CONFIG_ENCODERS #define av_register_output_format(format) #endif @@ -718,9 +651,5 @@ int raw_init(void) av_register_output_format(&rawvideo_oformat); av_register_output_format(&null_oformat); - - av_register_input_format(&adx_iformat); - av_register_output_format(&adx_oformat); - return 0; } |