oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

icynames are now copied to title of streams

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1258 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-05-31 11:42:46 +00:00
parent b4a91d574f
commit 000e053ce7
17 changed files with 169 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/inputPlugins/mp4_plugin.c
View File

@@ -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;