X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fvideo_stream.cpp;h=6ee9608816f1940be13c06ba8ca9fc2edacd6afa;hb=ed041ec8c0fa1dd31fd3c3ac053da13519c524c3;hp=8593936800a81307dc79e482b657a91cead7421b;hpb=ef2446c7768549827aed6cd2b635a514366c2025;p=nageru

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index 8593936..6ee9608 100644
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -208,10 +208,8 @@ VideoStream::VideoStream(AVFormatContext *file_avctx)
 	check_error();
 
 	OperatingPoint op;
-	if (global_flags.interpolation_quality == 0) {
-		// Allocate something just for simplicity; we won't be using it.
-		op = operating_point1;
-	} else if (global_flags.interpolation_quality == 1) {
+	if (global_flags.interpolation_quality == 0 ||
+	    global_flags.interpolation_quality == 1) {
 		op = operating_point1;
 	} else if (global_flags.interpolation_quality == 2) {
 		op = operating_point2;
@@ -220,6 +218,7 @@ VideoStream::VideoStream(AVFormatContext *file_avctx)
 	} else if (global_flags.interpolation_quality == 4) {
 		op = operating_point4;
 	} else {
+		// Quality 0 will be changed to 1 in flags.cpp.
 		assert(false);
 	}
 
@@ -594,6 +593,7 @@ void VideoStream::encode_thread_func()
 			pkt.stream_index = 0;
 			pkt.data = (uint8_t *)jpeg.data();
 			pkt.size = jpeg.size();
+			pkt.flags = AV_PKT_FLAG_KEY;
 			mux->add_packet(pkt, qf.output_pts, qf.output_pts);
 
 			last_frame.assign(&jpeg[0], &jpeg[0] + jpeg.size());
@@ -610,6 +610,7 @@ void VideoStream::encode_thread_func()
 			pkt.stream_index = 0;
 			pkt.data = (uint8_t *)jpeg.data();
 			pkt.size = jpeg.size();
+			pkt.flags = AV_PKT_FLAG_KEY;
 			mux->add_packet(pkt, qf.output_pts, qf.output_pts);
 			last_frame = move(jpeg);
 		} else if (qf.type == QueuedFrame::INTERPOLATED || qf.type == QueuedFrame::FADED_INTERPOLATED) {
@@ -634,6 +635,7 @@ void VideoStream::encode_thread_func()
 			pkt.stream_index = 0;
 			pkt.data = (uint8_t *)jpeg.data();
 			pkt.size = jpeg.size();
+			pkt.flags = AV_PKT_FLAG_KEY;
 			mux->add_packet(pkt, qf.output_pts, qf.output_pts);
 			last_frame = move(jpeg);
 		} else if (qf.type == QueuedFrame::REFRESH) {
@@ -642,6 +644,7 @@ void VideoStream::encode_thread_func()
 			pkt.stream_index = 0;
 			pkt.data = (uint8_t *)last_frame.data();
 			pkt.size = last_frame.size();
+			pkt.flags = AV_PKT_FLAG_KEY;
 			mux->add_packet(pkt, qf.output_pts, qf.output_pts);
 		} else {
 			assert(false);