From 4afd28b60a15f72e72a94bfc9a30001f567d3c8d Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Thu, 4 Jun 2009 00:17:14 +0000
Subject: [PATCH] Revert part of r3005, rename AV_PKT_FLAG_KEY back to
 PKT_FLAG_KEY, ffmpeg has added a compat define for any programs still using
 the old define.  This is a temporary measure until we figure out how to
 properly handle it.

Originally committed to SVN as r3012.
---
 aegisub/FFmpegSource2/ffaudiosource.cpp | 6 +++---
 aegisub/FFmpegSource2/ffvideosource.cpp | 4 ++--
 aegisub/FFmpegSource2/indexing.cpp      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aegisub/FFmpegSource2/ffaudiosource.cpp b/aegisub/FFmpegSource2/ffaudiosource.cpp
index aa71a7c61..860e67e8f 100644
--- a/aegisub/FFmpegSource2/ffaudiosource.cpp
+++ b/aegisub/FFmpegSource2/ffaudiosource.cpp
@@ -453,7 +453,7 @@ int FFMatroskaAudio::DecodeNextAudioBlock(int64_t *Count, int AudioBlock, char *
 	TempPacket.data = MC.Buffer;
 	TempPacket.size = FrameSize;
 	if (Frames[AudioBlock].KeyFrame)
-		TempPacket.flags = AV_PKT_FLAG_KEY;
+		TempPacket.flags = PKT_FLAG_KEY;
 	else
 		TempPacket.flags = 0;
 
@@ -512,7 +512,7 @@ int FFHaaliAudio::DecodeNextAudioBlock(int64_t *AFirstStartTime, int64_t *Count,
 			Packet.data = Data;
 			Packet.size = pMMF->GetActualDataLength();
 			if (pMMF->IsSyncPoint() == S_OK)
-				Packet.flags = AV_PKT_FLAG_KEY;
+				Packet.flags = PKT_FLAG_KEY;
 			else
 				Packet.flags = 0;
 
@@ -716,4 +716,4 @@ int FFHaaliAudio::GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorM
 	return 0;
 }
 
-#endif // HAALISOURCE
\ No newline at end of file
+#endif // HAALISOURCE
diff --git a/aegisub/FFmpegSource2/ffvideosource.cpp b/aegisub/FFmpegSource2/ffvideosource.cpp
index bbe8cb881..b6a4d0812 100644
--- a/aegisub/FFmpegSource2/ffvideosource.cpp
+++ b/aegisub/FFmpegSource2/ffvideosource.cpp
@@ -528,7 +528,7 @@ int FFMatroskaVideo::DecodeNextFrame(int64_t *AFirstStartTime, char *ErrorMsg, u
 		Packet.data = MC.Buffer;
 		Packet.size = FrameSize;
 		if (FrameFlags & FRAME_KF)
-			Packet.flags = AV_PKT_FLAG_KEY;
+			Packet.flags = PKT_FLAG_KEY;
 		else
 			Packet.flags = 0;
 
@@ -769,7 +769,7 @@ int FFHaaliVideo::DecodeNextFrame(int64_t *AFirstStartTime, char *ErrorMsg, unsi
 			Packet.data = Data;
 			Packet.size = pMMF->GetActualDataLength();
 			if (pMMF->IsSyncPoint() == S_OK)
-				Packet.flags = AV_PKT_FLAG_KEY;
+				Packet.flags = PKT_FLAG_KEY;
 			else
 				Packet.flags = 0;
 
diff --git a/aegisub/FFmpegSource2/indexing.cpp b/aegisub/FFmpegSource2/indexing.cpp
index 5cd1696a9..ce5656586 100644
--- a/aegisub/FFmpegSource2/indexing.cpp
+++ b/aegisub/FFmpegSource2/indexing.cpp
@@ -312,7 +312,7 @@ FFIndex *FFHaaliIndexer::DoIndexing(char *ErrorMsg, unsigned MsgSize) {
 			pMMF->GetPointer(&TempPacket.data);
 			TempPacket.size = pMMF->GetActualDataLength();
 			if (pMMF->IsSyncPoint() == S_OK)
-				TempPacket.flags = AV_PKT_FLAG_KEY;
+				TempPacket.flags = PKT_FLAG_KEY;
 			else
 				TempPacket.flags = 0;
 
@@ -457,7 +457,7 @@ FFIndex *FFMatroskaIndexer::DoIndexing(char *ErrorMsg, unsigned MsgSize) {
 			TempPacket.data = MC.Buffer;
 			TempPacket.size = FrameSize;
 			if ((FrameFlags & FRAME_KF) != 0)
-				TempPacket.flags = AV_PKT_FLAG_KEY;
+				TempPacket.flags = PKT_FLAG_KEY;
 			else
 				TempPacket.flags = 0;
 
@@ -600,9 +600,9 @@ FFIndex *FFLAVFIndexer::DoIndexing(char *ErrorMsg, unsigned MsgSize) {
 
 		// Only create index entries for video for now to save space
 		if (FormatContext->streams[Packet.stream_index]->codec->codec_type == CODEC_TYPE_VIDEO) {
-			(*TrackIndices)[Packet.stream_index].push_back(TFrameInfo(Packet.dts, (Packet.flags & AV_PKT_FLAG_KEY) ? 1 : 0));
+			(*TrackIndices)[Packet.stream_index].push_back(TFrameInfo(Packet.dts, (Packet.flags & PKT_FLAG_KEY) ? 1 : 0));
 		} else if (FormatContext->streams[Packet.stream_index]->codec->codec_type == CODEC_TYPE_AUDIO && (IndexMask & (1 << Packet.stream_index))) {
-			(*TrackIndices)[Packet.stream_index].push_back(TFrameInfo(Packet.dts, AudioContexts[Packet.stream_index].CurrentSample, (Packet.flags & AV_PKT_FLAG_KEY) ? 1 : 0));
+			(*TrackIndices)[Packet.stream_index].push_back(TFrameInfo(Packet.dts, AudioContexts[Packet.stream_index].CurrentSample, (Packet.flags & PKT_FLAG_KEY) ? 1 : 0));
 			AVCodecContext *AudioCodecContext = FormatContext->streams[Packet.stream_index]->codec;
 			TempPacket.data = Packet.data;
 			TempPacket.size = Packet.size;