[FFmpeg-cvslog] mpegvideo: fix compilation after 900321b08c95bd42e6db53864bfffbe48d6019da

Stefano Sabatini git at videolan.org
Sat Jul 16 19:03:19 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat Jul 16 18:49:39 2011 +0200| [7bda0c9a82eb3c9a58e0c9f170ac47fe7289f6f7] | committer: Stefano Sabatini

mpegvideo: fix compilation after 900321b08c95bd42e6db53864bfffbe48d6019da

Replace:
s->last_picture_ptr->f.key_frame = 0;
with:
s->last_picture_ptr->key_frame = 0;

This is required since mpegvideo.h:Picture now contains an embedded
AVFrame f, rather than a literal copy of the AVFrame fields.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bda0c9a82eb3c9a58e0c9f170ac47fe7289f6f7
---

 libavcodec/mpegvideo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 3749fd9..f448241 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1114,7 +1114,7 @@ int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
             /* Allocate a dummy frame */
             i= ff_find_unused_picture(s, 0);
             s->last_picture_ptr= &s->picture[i];
-            s->last_picture_ptr->key_frame = 0;
+            s->last_picture_ptr->f.key_frame = 0;
             if(ff_alloc_picture(s, s->last_picture_ptr, 0) < 0)
                 return -1;
             ff_thread_report_progress((AVFrame*)s->last_picture_ptr, INT_MAX, 0);
@@ -1124,7 +1124,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->next_picture_ptr->key_frame = 0;
+            s->next_picture_ptr->f.key_frame = 0;
             if(ff_alloc_picture(s, s->next_picture_ptr, 0) < 0)
                 return -1;
             ff_thread_report_progress((AVFrame*)s->next_picture_ptr, INT_MAX, 0);



More information about the ffmpeg-cvslog mailing list