diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-05-31 11:42:46 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-05-31 11:42:46 +0000 |
| commit | 000e053ce73f6f87bc7c3797caceb1b60e467dcf (patch) | |
| tree | 2411ee50bcd20c53cb8ed6f82bfb76ee5227d77b /src/inputPlugins/mp4_plugin.c | |
| parent | b4a91d574fb3ad8ffdacab792a46cc668010c7d6 (diff) | |
| download | mpd-000e053ce73f6f87bc7c3797caceb1b60e467dcf.tar.gz mpd-000e053ce73f6f87bc7c3797caceb1b60e467dcf.tar.xz mpd-000e053ce73f6f87bc7c3797caceb1b60e467dcf.zip | |
icynames are now copied to title of streams
git-svn-id: https://svn.musicpd.org/mpd/trunk@1258 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
| -rw-r--r-- | src/inputPlugins/mp4_plugin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c index 350aae777..f17b0b4ce 100644 --- a/src/inputPlugins/mp4_plugin.c +++ b/src/inputPlugins/mp4_plugin.c @@ -85,7 +85,7 @@ uint32_t mp4_inputStreamSeekCallback(void *inStream, uint64_t position) { } -int mp4_decode(OutputBuffer * cb, DecoderControl * dc) { +int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char * path) { mp4ff_t * mp4fh; mp4ff_callback_t * mp4cb; int32_t track; @@ -113,8 +113,8 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) { mpd_uint16 bitRate = 0; InputStream inStream; - if(openInputStream(&inStream,dc->file) < 0) { - ERROR("failed to open %s\n",dc->file); + if(openInputStream(&inStream, path) < 0) { + ERROR("failed to open %s\n", path); return -1; } @@ -241,7 +241,7 @@ int mp4_decode(OutputBuffer * cb, DecoderControl * dc) { if(mp4Buffer) free(mp4Buffer); if(frameInfo.error > 0) { - ERROR("error decoding MP4 file: %s\n",dc->file); + ERROR("error decoding MP4 file: %s\n", path); ERROR("faad2 error: %s\n", faacDecGetErrorMessage(frameInfo.error)); eof = 1; |