aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg/patches
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2013-05-01 14:40:51 -0700
committerMartijn Kaijser <machine.sanctum@gmail.com>2013-05-01 14:40:51 -0700
commitf0c139993f13a077438f82f96dab831f240b58b0 (patch)
treea808d5d1b2947ba5acdc579ef8c21678502d4dcc /lib/ffmpeg/patches
parentba67f986a1802336a8453cc2198e8becec3b289a (diff)
parent451d5ce02be3f4c88ea45a97d95639bee767f7bb (diff)
Merge pull request #2634 from FlyingRat/patch-0028-cwd-updated
[ffmpeg] fix: patch needs to operate from lib/ffmpeg
Diffstat (limited to 'lib/ffmpeg/patches')
-rw-r--r--lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch b/lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch
index d294ff174e..17ec941c7f 100644
--- a/lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch
+++ b/lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch
@@ -5,13 +5,13 @@ Subject: [PATCH 4/4] ffmpeg 1.2 - fixed dvd still frames ended up in internal
lavf
---
- lib/ffmpeg/libavformat/utils.c | 2 +-
+ libavformat/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/lib/ffmpeg/libavformat/utils.c b/lib/ffmpeg/libavformat/utils.c
+diff --git a/libavformat/utils.c b/libavformat/utils.c
index c3bd3d9..72f59d2 100644
---- a/lib/ffmpeg/libavformat/utils.c
-+++ b/lib/ffmpeg/libavformat/utils.c
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
@@ -706,7 +706,7 @@ no_packet:
if(end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){