projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3045faa
)
Try to throw an exception rather than asserting on an unknown sound format.
author
Carl Hetherington
<cth@carlh.net>
Tue, 18 Dec 2012 19:05:55 +0000
(19:05 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 18 Dec 2012 19:05:55 +0000
(19:05 +0000)
src/lib/ffmpeg_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index 74eb8934ca5e87ffbde809bf3e9fb70b2360014d..911714d7b3c31c19876d2aaef8eefbbfcbbb1c93 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-450,7
+450,7
@@
FFmpegDecoder::deinterleave_audio (uint8_t* data, int size)
break;
default:
-
assert (false
);
+
throw DecodeError (String::compose ("Unrecognised audio sample format (%1)", static_cast<int> (audio_sample_format()))
);
}
return audio;