X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.cc;h=38dd678bbfa91da1f80562f3dac0d7fcf78c0829;hb=4e5d5c7dcc6470b8dc918d03a00e30c07df60efe;hp=78b6e3121c363faf1b0c95a4701970273b970636;hpb=8bef34f672815c3c9b4236d06fdee8dfd0bffbc2;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 78b6e3121..38dd678bb 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -70,7 +70,6 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
 		}
 
 		int frame_finished;
-		avcodec_get_frame_defaults (_frame);
 
 		AVCodecContext* context = _format_context->streams[_packet.stream_index]->codec;
 
@@ -135,10 +134,10 @@ FFmpegExaminer::video_size () const
 }
 
 /** @return Length (in video frames) according to our content's header */
-VideoContent::Frame
+VideoFrame
 FFmpegExaminer::video_length () const
 {
-	VideoContent::Frame const length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate();
+	VideoFrame const length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate();
 	return max (1, length);
 }