summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg/A01-mpegleak.patch
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-08-01 17:48:28 +0000
committerjstebbins <[email protected]>2011-08-01 17:48:28 +0000
commit7a083edaa1a8d331ca8eb2878f051a4fc1966d43 (patch)
treeb0b14bdb5a0e07eaf007811b27817e2ffa960332 /contrib/ffmpeg/A01-mpegleak.patch
parentac3e2eaf6d6deb4ce9b86ce38a3715b3d8968da1 (diff)
bump Libav from git-v0.7b2-406-g7b20d35 to release 0.7.1
It includes the following fixes: - MKV seek issue: http://git.libav.org/?p=libav.git;a=commit;h=c29c609 - crash when decoding corrupt MPEG-2 streams: http://git.libav.org/?p=libav.git;a=commit;h=20153fb - other misc. fixes: http://git.libav.org/?p=libav.git;a=shortlog;h=refs/heads/release/0.7 It includes the following new feature: - support for DTS in MP4 and MOV files: http://git.libav.org/?p=libav.git;a=commit;h=26f4875 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4148 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/A01-mpegleak.patch')
-rw-r--r--contrib/ffmpeg/A01-mpegleak.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ffmpeg/A01-mpegleak.patch b/contrib/ffmpeg/A01-mpegleak.patch
index 1ca462c6d..555be9228 100644
--- a/contrib/ffmpeg/A01-mpegleak.patch
+++ b/contrib/ffmpeg/A01-mpegleak.patch
@@ -1,8 +1,8 @@
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 0aa923f..15bf61d 100644
+index 2c000a3..93850d6 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
-@@ -3644,7 +3644,7 @@ static int decode_frame(AVCodecContext *avctx,
+@@ -3908,7 +3908,7 @@ static int decode_frame(AVCodecContext *avctx,
if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
if (avctx->skip_frame >= AVDISCARD_NONREF)
return 0;
@@ -25,7 +25,7 @@ index a025f7d..eda5e41 100644
"corrupt input), discarding one\n",
h->long_ref_count, h->short_ref_count, h->sps.ref_frame_count);
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
-index 6a45da8..dc25c4d 100644
+index 4978d28..bb9509f 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -986,19 +986,18 @@ int ff_find_unused_picture(MpegEncContext *s, int shared){