diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
| commit | 4dbc6ef917aeceb906b1ef1caf6911033e7e2c54 (patch) | |
| tree | 203675d00d5cc004be6205218f835b6d7a10e925 /src/lib/ffmpeg_stream.cc | |
| parent | ab32f60c2c9f2ad01dc8d96dc375df256dba0c41 (diff) | |
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Diffstat (limited to 'src/lib/ffmpeg_stream.cc')
| -rw-r--r-- | src/lib/ffmpeg_stream.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc index 3fac33327..ad99defee 100644 --- a/src/lib/ffmpeg_stream.cc +++ b/src/lib/ffmpeg_stream.cc @@ -17,12 +17,13 @@ */ +#include "ffmpeg_stream.h" +#include "dcpomatic_assert.h" +#include <dcp/raw_convert.h> +#include <libxml++/libxml++.h> extern "C" { #include <libavformat/avformat.h> } -#include <libxml++/libxml++.h> -#include <dcp/raw_convert.h> -#include "ffmpeg_stream.h" using std::string; using dcp::raw_convert; @@ -66,6 +67,6 @@ FFmpegStream::stream (AVFormatContext const * fc) const ++i; } - assert (false); + DCPOMATIC_ASSERT (false); return 0; } |
