projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove an unused using.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.cc
diff --git
a/src/lib/ffmpeg_examiner.cc
b/src/lib/ffmpeg_examiner.cc
index 632508e0ed3670f0e9fa89272751d4d1a9a28dec..853db90be3e3ef1ec36cc834a51f0ff6754468e9 100644
(file)
--- a/
src/lib/ffmpeg_examiner.cc
+++ b/
src/lib/ffmpeg_examiner.cc
@@
-33,8
+33,9
@@
extern "C" {
#include <libavformat/avformat.h>
#include <libavutil/pixfmt.h>
#include <libavutil/pixdesc.h>
#include <libavformat/avformat.h>
#include <libavutil/pixfmt.h>
#include <libavutil/pixdesc.h>
-#include <libavutil/
eval
.h>
+#include <libavutil/
channel_layout
.h>
#include <libavutil/display.h>
#include <libavutil/display.h>
+#include <libavutil/eval.h>
}
DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
}
DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
@@
-69,7
+70,8
@@
FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
auto s = _format_context->streams[i];
for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
auto s = _format_context->streams[i];
- if (s->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
+ auto codec = _codec_context[i] ? _codec_context[i]->codec : nullptr;
+ if (s->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && codec) {
/* This is a hack; sometimes it seems that _audio_codec_context->channel_layout isn't set up,
so bodge it here. No idea why we should have to do this.
/* This is a hack; sometimes it seems that _audio_codec_context->channel_layout isn't set up,
so bodge it here. No idea why we should have to do this.
@@
-79,10
+81,7
@@
FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
s->codecpar->channel_layout = av_get_default_channel_layout (s->codecpar->channels);
}
s->codecpar->channel_layout = av_get_default_channel_layout (s->codecpar->channels);
}
- auto codec = _codec_context[i]->codec;
-
DCPOMATIC_ASSERT (_format_context->duration != AV_NOPTS_VALUE);
DCPOMATIC_ASSERT (_format_context->duration != AV_NOPTS_VALUE);
- DCPOMATIC_ASSERT (codec);
DCPOMATIC_ASSERT (codec->name);
_audio_streams.push_back (
DCPOMATIC_ASSERT (codec->name);
_audio_streams.push_back (