aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg
diff options
context:
space:
mode:
authorelupus <elupus@xbmc.org>2011-07-11 19:19:50 +0200
committerelupus <elupus@xbmc.org>2011-07-11 21:16:50 +0200
commitc1aa0af587b778f18084d33cfbfa74abf7d9cc20 (patch)
tree01428bf15875029c59521493d8763af8b12490c5 /lib/ffmpeg
parente808d0d7fee7f40940efafcdc63993fb6175acff (diff)
fixed: typo in lavc dummy frame fix
Diffstat (limited to 'lib/ffmpeg')
-rw-r--r--lib/ffmpeg/libavcodec/mpegvideo.c2
-rw-r--r--lib/ffmpeg/patches/0048-Dont-mark-genereted-dummy-frame-as-keyframe.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ffmpeg/libavcodec/mpegvideo.c b/lib/ffmpeg/libavcodec/mpegvideo.c
index a0acda19c1..31642e6fe2 100644
--- a/lib/ffmpeg/libavcodec/mpegvideo.c
+++ b/lib/ffmpeg/libavcodec/mpegvideo.c
@@ -1004,7 +1004,7 @@ int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
/* Allocate a dummy frame */
i= ff_find_unused_picture(s, 0);
s->next_picture_ptr= &s->picture[i];
- s->last_picture_ptr->key_frame = 0;
+ s->next_picture_ptr->key_frame = 0;
if(ff_alloc_picture(s, s->next_picture_ptr, 0) < 0)
return -1;
}
diff --git a/lib/ffmpeg/patches/0048-Dont-mark-genereted-dummy-frame-as-keyframe.patch b/lib/ffmpeg/patches/0048-Dont-mark-genereted-dummy-frame-as-keyframe.patch
index ca454224fc..39e92bf100 100644
--- a/lib/ffmpeg/patches/0048-Dont-mark-genereted-dummy-frame-as-keyframe.patch
+++ b/lib/ffmpeg/patches/0048-Dont-mark-genereted-dummy-frame-as-keyframe.patch
@@ -25,7 +25,7 @@ index c8706bc..a0acda1 100644
/* Allocate a dummy frame */
i= ff_find_unused_picture(s, 0);
s->next_picture_ptr= &s->picture[i];
-+ s->last_picture_ptr->key_frame = 0;
++ s->next_picture_ptr->key_frame = 0;
if(ff_alloc_picture(s, s->next_picture_ptr, 0) < 0)
return -1;
}