aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-08-09 00:10:04 +0200
committerMax Kellermann <max@duempel.org>2014-08-09 00:10:04 +0200
commite8a5a9b1e8cabb3256903af3f25d4062b859f2e6 (patch)
tree56ef813d64b8863f25de97141c34bf3477d0e0d3
parenta67a881715ca521347cc86631d770c9e6755c877 (diff)
parentec3568bd97b0ea094df4b480b05a81c1d9db35b8 (diff)
downloadmpd-e8a5a9b1e8cabb3256903af3f25d4062b859f2e6.tar.gz
mpd-e8a5a9b1e8cabb3256903af3f25d4062b859f2e6.tar.xz
mpd-e8a5a9b1e8cabb3256903af3f25d4062b859f2e6.zip
Merge branch 'mp4v2' of github.com:ekroth/mpd
-rw-r--r--src/decoder/plugins/Mp4v2DecoderPlugin.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/decoder/plugins/Mp4v2DecoderPlugin.cxx b/src/decoder/plugins/Mp4v2DecoderPlugin.cxx
index 3cdd97167..36d02c81d 100644
--- a/src/decoder/plugins/Mp4v2DecoderPlugin.cxx
+++ b/src/decoder/plugins/Mp4v2DecoderPlugin.cxx
@@ -91,15 +91,14 @@ mp4_get_aac_track(MP4FileHandle handle, NeAACDecHandle decoder,
if (!audio_format_init_checked(audio_format, sample_rate,
SampleFormat::S16,
channels,
- error)) {
- error.Set(mp4v2_decoder_domain,
- "Invalid audio format");
+ error))
continue;
- }
return id;
}
+ error.Set(mp4v2_decoder_domain, "no valid aac track found");
+
return MP4_INVALID_TRACK_ID;
}
@@ -117,7 +116,6 @@ mp4_faad_new(MP4FileHandle handle, AudioFormat &audio_format, Error &error)
const auto track = mp4_get_aac_track(handle, decoder, audio_format, error);
if (track == MP4_INVALID_TRACK_ID) {
- LogError(error);
NeAACDecClose(decoder);
return nullptr;
}
@@ -132,7 +130,7 @@ mp4_file_decode(Decoder &mpd_decoder, Path path_fs)
if (handle == MP4_INVALID_FILE_HANDLE) {
FormatError(mp4v2_decoder_domain,
- "Unable to open file");
+ "unable to open file");
return;
}