projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
53fe2c8
)
C++11 tidying.
author
Carl Hetherington
<cth@carlh.net>
Mon, 1 Mar 2021 16:53:33 +0000
(17:53 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 2 Mar 2021 14:40:18 +0000
(15:40 +0100)
src/lib/ffmpeg_examiner.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_examiner.cc
b/src/lib/ffmpeg_examiner.cc
index 78b96666f4f8065476b2c83483cf9290aa09d0c3..b07ee5d623d5421c151b6c9a5e01ad0b5c4082d0 100644
(file)
--- a/
src/lib/ffmpeg_examiner.cc
+++ b/
src/lib/ffmpeg_examiner.cc
@@
-304,7
+304,7
@@
FFmpegExaminer::sample_aspect_ratio () const
AVRational sar = av_guess_sample_aspect_ratio (_format_context, _format_context->streams[_video_stream.get()], 0);
if (sar.num == 0) {
/* I assume this means that we don't know */
- return
optional<double> ()
;
+ return
{}
;
}
return double (sar.num) / sar.den;
}
@@
-312,7
+312,7
@@
FFmpegExaminer::sample_aspect_ratio () const
string
FFmpegExaminer::subtitle_stream_name (AVStream* s) const
{
-
string
n = stream_name (s);
+
auto
n = stream_name (s);
if (n.empty()) {
n = _("unknown");