diff options
author | konablend <[email protected]> | 2012-09-10 17:39:20 +0000 |
---|---|---|
committer | konablend <[email protected]> | 2012-09-10 17:39:20 +0000 |
commit | 438f63486268526dea56410a5e5a31f04b0bdaa2 (patch) | |
tree | 72ab2d45a853a395b709906995685c15f4e4a946 /contrib/ffmpeg | |
parent | 0f39e0706350385b4260a58fa9273e716d61d663 (diff) |
Remove contrib/ffmpeg/A02-png-sequences.patch.
Set AVPacket flags indicating key-frame for avcodec_decode_video2() call. Specifically, libav documentation states:
* @param[in] avpkt The input AVpacket containing the input buffer.
* You can create such packet with av_init_packet() and by then setting
* data and size, some decoders might in addition need other fields like
* flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
* fields possible.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4950 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r-- | contrib/ffmpeg/A02-png-sequences.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/contrib/ffmpeg/A02-png-sequences.patch b/contrib/ffmpeg/A02-png-sequences.patch deleted file mode 100644 index 6098c3150..000000000 --- a/contrib/ffmpeg/A02-png-sequences.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c -index 871f2b2..cba2e90 100644 ---- a/libavcodec/pngdec.c -+++ b/libavcodec/pngdec.c -@@ -592,6 +592,24 @@ static int decode_frame(AVCodecContext *avctx, - } - } - exit_loop: -+/* ffmpeg-r18421 introduced support for CorePNG p-frames which -+ * breaks raw png sequences created by QuickTime Pro. -+ * since only the first png appears to be marked as PKT_FLAG_KEY -+ * it means either QuickTime Pro is encoding incorrectly, or -+ * this code block needs to find other criteria. -+ * -+ * As of ffmpeg-r19079 this patch should no longer be required. -+ * It offers a similar solution; forces code block to be skipped. -+ * -+ * --kb -+ * -+ * The "fix" in r19079 was a hack placed in avcodec_decode_video. -+ * avcodec_decode_video was obsoleted and no longer exists. The -+ * "fix" disappeared with it. -+ * -+ * --jas -+ */ -+#if 0 - /* handle p-frames only if a predecessor frame is available */ - if(s->last_picture->data[0] != NULL) { - if(!(avpkt->flags & AV_PKT_FLAG_KEY)) { -@@ -608,6 +626,7 @@ static int decode_frame(AVCodecContext *avctx, - } - } - } -+#endif - - *picture= *s->current_picture; - *data_size = sizeof(AVFrame); |