Mercurial > audlegacy-plugins
changeset 835:485ba2ba5976 trunk
[svn] - working WMA playback. thanks to chainsaw for providing a ton and a half of WMA files.
| author | nenolod |
|---|---|
| date | Mon, 12 Mar 2007 16:02:16 -0700 |
| parents | a9732dc1b92a |
| children | 7efd0747b362 |
| files | ChangeLog src/ffmpeg/ffmpeg.c |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 12 15:52:56 2007 -0700 +++ b/ChangeLog Mon Mar 12 16:02:16 2007 -0700 @@ -1,3 +1,11 @@ +2007-03-12 22:52:56 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [1768] + - codec support here too. + + trunk/src/ffmpeg/libavcodec/allcodecs.c | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + + 2007-03-12 22:50:24 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [1766] - base wma support
--- a/src/ffmpeg/ffmpeg.c Mon Mar 12 15:52:56 2007 -0700 +++ b/src/ffmpeg/ffmpeg.c Mon Mar 12 16:02:16 2007 -0700 @@ -206,7 +206,7 @@ if(av_open_input_file(&ic2, str_twenty_to_space(filename), NULL, 0, NULL) < 0) return 0; for(wma_idx2 = 0; wma_idx2 < ic2->nb_streams; wma_idx2++) { - c2 = &ic2->streams[wma_idx2]->codec; + c2 = ic2->streams[wma_idx2]->codec; if(c2->codec_type == CODEC_TYPE_AUDIO) break; } @@ -230,7 +230,7 @@ if(av_open_input_vfsfile(&ic2, filename, fd, NULL, 0, NULL) < 0) return 0; for(wma_idx2 = 0; wma_idx2 < ic2->nb_streams; wma_idx2++) { - c2 = &ic2->streams[wma_idx2]->codec; + c2 = ic2->streams[wma_idx2]->codec; if(c2->codec_type == CODEC_TYPE_AUDIO) break; } @@ -281,7 +281,7 @@ AVFormatContext *in = NULL; gchar *filename_proxy = g_strdup(filename); - if (av_open_input_file(&in, str_twenty_to_space(filename), NULL, 0, NULL) < 0) + if(av_open_input_file(&ic2, str_twenty_to_space(filename), NULL, 0, NULL) < 0) return NULL; tuple = bmp_title_input_new(); @@ -442,7 +442,7 @@ if(av_open_input_file(&ic, str_twenty_to_space(filename), NULL, 0, NULL) < 0) return; for(wma_idx = 0; wma_idx < ic->nb_streams; wma_idx++) { - c = &ic->streams[wma_idx]->codec; + c = ic->streams[wma_idx]->codec; if(c->codec_type == CODEC_TYPE_AUDIO) break; } @@ -451,7 +451,7 @@ codec = avcodec_find_decoder(c->codec_id); if(!codec) return; - + if(avcodec_open(c, codec) < 0) return; wsong_title = get_song_title(ic, filename);