Remove some FFmpeg-related warnings by using AVStream::codecpar.

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index eb131d434b24572c423cd6ada89bb5759b0d6b0f..7bb17f9bf0f1ff238be0bd04d002cabe79946eff 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -143,10 +143,9 @@ FFmpeg::setup_general ()
 
        optional<int> video_stream_undefined_frame_rate;
 
-DCPOMATIC_DISABLE_WARNINGS
        for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
                auto s = _format_context->streams[i];
-               if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codec->codec_id)) {
+               if (s->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codecpar->codec_id)) {
                        if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) {
                                /* This is definitely our video stream */
                                _video_stream = i;
@@ -156,7 +155,6 @@ DCPOMATIC_DISABLE_WARNINGS
                        }
                }
        }
-DCPOMATIC_ENABLE_WARNINGS
 
        /* Files from iTunes sometimes have two video streams, one with the avg_frame_rate.num and .den set
           to zero.  Only use such a stream if there is no alternative.

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 9d7e155573e1e38e6a9d003a451fa54b26f91682..700e2983681750b17ecefcf07cd23a0037eac4ed 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -228,11 +228,9 @@ FFmpegDecoder::deinterleave_audio (shared_ptr<FFmpegAudioStream> stream) const
 {
        DCPOMATIC_ASSERT (bytes_per_audio_sample (stream));
 
-DCPOMATIC_DISABLE_WARNINGS
        int const size = av_samples_get_buffer_size (
-               0, stream->stream(_format_context)->codec->channels, _frame->nb_samples, audio_sample_format (stream), 1
+               0, stream->stream(_format_context)->codecpar->channels, _frame->nb_samples, audio_sample_format (stream), 1
                );
-DCPOMATIC_ENABLE_WARNINGS
        DCPOMATIC_ASSERT (size >= 0);
 
        /* XXX: can't we just use _frame->nb_samples directly here? */
@@ -365,9 +363,7 @@ DCPOMATIC_ENABLE_WARNINGS
 AVSampleFormat
 FFmpegDecoder::audio_sample_format (shared_ptr<FFmpegAudioStream> stream) const
 {
-DCPOMATIC_DISABLE_WARNINGS
-       return stream->stream (_format_context)->codec->sample_fmt;
-DCPOMATIC_ENABLE_WARNINGS
+       return static_cast<AVSampleFormat>(stream->stream(_format_context)->codecpar->format);
 }
 
 

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 782df4d20bfad835865b0dd561db4b2fb01d4e69..18b90e0b599b54cb6d1b13d866d45387122d11c7 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -335,8 +335,8 @@ FFmpegFileEncoder::setup_video ()
                throw runtime_error ("could not create FFmpeg output video stream");
        }
 
-DCPOMATIC_DISABLE_WARNINGS
        _video_stream->id = _video_stream_index;
+DCPOMATIC_DISABLE_WARNINGS
        _video_stream->codec = _video_codec_context;
 DCPOMATIC_ENABLE_WARNINGS