Mercurial > audlegacy-plugins
changeset 841:9b50e71f7307 trunk
[svn] - implement shorten support more correctly.
| author | nenolod |
|---|---|
| date | Mon, 12 Mar 2007 17:37:02 -0700 |
| parents | 3d9f9cf54d27 |
| children | 47144a91649d |
| files | ChangeLog src/ffmpeg/ffmpeg.c src/ffmpeg/libavformat/allformats.c src/ffmpeg/libavformat/raw.c src/ffmpeg/libavformat/wav.c |
| diffstat | 5 files changed, 13 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 12 17:20:48 2007 -0700 +++ b/ChangeLog Mon Mar 12 17:37:02 2007 -0700 @@ -1,3 +1,11 @@ +2007-03-13 00:20:48 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [1780] + - add a TODO for people wanting to play with this + + trunk/src/ffmpeg/TODO | 6 ++++++ + 1 file changed, 6 insertions(+) + + 2007-03-13 00:17:39 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [1778] - remove ffwma
--- a/src/ffmpeg/ffmpeg.c Mon Mar 12 17:20:48 2007 -0700 +++ b/src/ffmpeg/ffmpeg.c Mon Mar 12 17:37:02 2007 -0700 @@ -94,7 +94,7 @@ InputPlugin *get_iplugin_info(void); -gchar *ffmpeg_fmts[] = { "wma", NULL }; +gchar *ffmpeg_fmts[] = { "wma", "shn", NULL }; InputPlugin ffmpeg_ip = { @@ -399,7 +399,7 @@ if(ffmpeg_seekpos != -1) { - av_seek_frame(ic, ffmpeg_idx, ffmpeg_seekpos * 1000000LL, 0); + av_seek_frame(ic, ffmpeg_idx, ffmpeg_seekpos * 1000000LL, AVSEEK_FLAG_BYTE); playback->output->flush(ffmpeg_seekpos * 1000); ffmpeg_seekpos = -1; }
--- a/src/ffmpeg/libavformat/allformats.c Mon Mar 12 17:20:48 2007 -0700 +++ b/src/ffmpeg/libavformat/allformats.c Mon Mar 12 17:37:02 2007 -0700 @@ -40,6 +40,7 @@ av_register_input_format(&asf_demuxer); av_register_input_format(&shorten_demuxer); + av_register_input_format(&wav_demuxer); register_protocol(&file_protocol); }
--- a/src/ffmpeg/libavformat/raw.c Mon Mar 12 17:20:48 2007 -0700 +++ b/src/ffmpeg/libavformat/raw.c Mon Mar 12 17:37:02 2007 -0700 @@ -227,6 +227,8 @@ { AVStream *st; + g_print("1@\n"); + st = av_new_stream(s, 0); if (!st) return AVERROR_NOMEM;
--- a/src/ffmpeg/libavformat/wav.c Mon Mar 12 17:20:48 2007 -0700 +++ b/src/ffmpeg/libavformat/wav.c Mon Mar 12 17:37:02 2007 -0700 @@ -225,7 +225,6 @@ return pcm_read_seek(s, stream_index, timestamp, flags); } -#ifdef CONFIG_WAV_DEMUXER AVInputFormat wav_demuxer = { "wav", "wav format", @@ -236,18 +235,3 @@ wav_read_close, wav_read_seek, }; -#endif -#ifdef CONFIG_WAV_MUXER -AVOutputFormat wav_muxer = { - "wav", - "wav format", - "audio/x-wav", - "wav", - sizeof(WAVContext), - CODEC_ID_PCM_S16LE, - CODEC_ID_NONE, - wav_write_header, - wav_write_packet, - wav_write_trailer, -}; -#endif