Some const-correctness.

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index f253c73a0d9b69d6c7d29f41dbf87eb8e3aa8a10..83e707725718aeb14f3c0b19bd6ba368f251da11 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -203,7 +203,7 @@ public:
 
 private:
        AVFormatContext* _format_context;
-       AVCodec* _codec;
+       AVCodec const * _codec;
        AVCodecContext* _codec_context;
        AVStream* _stream;
        int _stream_index;

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 330ae1ff97bc0757efc483e2668f5d1aeed7bb05..9f3d88551266b26a184f03fa37f2d4f34e690e36 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -73,7 +73,7 @@ private:
        static void buffer_free(void* opaque, uint8_t* data);
        void buffer_free2(uint8_t* data);
 
-       AVCodec* _video_codec = nullptr;
+       AVCodec const * _video_codec = nullptr;
        AVCodecContext* _video_codec_context = nullptr;
        std::vector<std::shared_ptr<ExportAudioStream>> _audio_streams;
        bool _audio_stream_per_channel;

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 54fb1c46837012485d3a93dbdd37ae3e71ceeecc..e7d5b424dc0da3bdb052eab77f14c90f3fd0716b 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -133,11 +133,11 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
        }
 
        uint8_t* avio_buffer = static_cast<uint8_t*> (wrapped_av_malloc(4096));
-       AVIOContext* avio_context = avio_alloc_context (avio_buffer, 4096, 0, const_cast<FFmpegImageProxy*>(this), avio_read_wrapper, 0, avio_seek_wrapper);
+       auto avio_context = avio_alloc_context (avio_buffer, 4096, 0, const_cast<FFmpegImageProxy*>(this), avio_read_wrapper, 0, avio_seek_wrapper);
        AVFormatContext* format_context = avformat_alloc_context ();
        format_context->pb = avio_context;
 
-       AVDictionary* options = 0;
+       AVDictionary* options = nullptr;
        /* These durations are in microseconds, and represent how far into the content file
           we will look for streams.
        */
@@ -150,7 +150,7 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
                   directly from the file).  This code just does enough to allow the
                   probe code to take a hint from "foo.tga" and so try targa format.
                */
-               AVInputFormat* f = av_find_input_format ("image2");
+               auto f = av_find_input_format ("image2");
                format_context = avformat_alloc_context ();
                format_context->pb = avio_context;
                format_context->iformat = f;
@@ -171,7 +171,7 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 
        DCPOMATIC_ASSERT (format_context->nb_streams == 1);
 
-       AVFrame* frame = av_frame_alloc ();
+       auto frame = av_frame_alloc ();
        if (!frame) {
                std::bad_alloc ();
        }