X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=52afe2a271e79360cf8fea54257f3e6b239495c9;hp=8742c48ecd6360021bcb309636ba376a300ccc28;hb=4e5d5c7dcc6470b8dc918d03a00e30c07df60efe;hpb=e8204f55c981493b99814f71a50b3c3d62601032

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 8742c48ec..52afe2a27 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -160,8 +160,6 @@ FFmpegDecoder::pass ()
 		return true;
 	}
 
-	avcodec_get_frame_defaults (_frame);
-
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 
@@ -561,8 +559,13 @@ FFmpegDecoder::decode_subtitle_packet ()
 	/* Subtitle PTS in seconds (within the source, not taking into account any of the
 	   source that we may have chopped off for the DCP)
 	*/
+<<<<<<< HEAD
 	double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _pts_offset;
 	
+=======
+	double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _video_pts_offset;
+
+>>>>>>> master
 	/* hence start time for this sub */
 	ContentTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
 	ContentTime const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ;