Don't throw an exception if we can't find bits_per_pixel, as it's not the end of...

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 88b76d04efc9593e1fc3df632e292c4c19189174..697bfe3ae1a40b80851cf690f95eed703ca966a3 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -260,11 +260,11 @@ FFmpegExaminer::stream_name (AVStream* s) const
        return n;
 }
 
-int
+optional<int>
 FFmpegExaminer::bits_per_pixel () const
 {
        if (video_codec_context()->pix_fmt == -1) {
-               throw DecodeError (_("Could not find pixel format for video."));
+               return optional<int>();
        }
 
        AVPixFmtDescriptor const * d = av_pix_fmt_desc_get (video_codec_context()->pix_fmt);

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index a511a2fc1fd20360eab70dbbffaeed4f7efa19bc..5cd70d979cd6722f22fdebc3a22bef7f28a64c12 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -69,7 +69,7 @@ public:
                return video_codec_context()->colorspace;
        }
 
-       int bits_per_pixel () const;
+       boost::optional<int> bits_per_pixel () const;
 
 private:
        void video_packet (AVCodecContext *);