diff options
author | Diego Biurrun <diego@biurrun.de> | 2011-09-13 19:00:41 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2011-09-21 11:57:32 +0400 |
commit | 95a06eb4d59c5ab0ce53b0cc9d10d1b26be939e2 (patch) | |
tree | 72ee6a36582f4653d51ce7a5240640b8b9d53594 /libavcodec/mpegvideo.c | |
parent | 35a68558688fb6fa62261008e93bd16544fbd37e (diff) |
Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
This fixes build failures with -DDEBUG in CPPFLAGS.
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 8d40492346..6839186aac 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -225,7 +225,7 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) int r; if (s->avctx->hwaccel) { - assert(!pic->hwaccel_picture_private); + assert(!pic->f.hwaccel_picture_private); if (s->avctx->hwaccel->priv_data_size) { pic->f.hwaccel_picture_private = av_mallocz(s->avctx->hwaccel->priv_data_size); if (!pic->f.hwaccel_picture_private) { @@ -276,7 +276,7 @@ int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared){ if(shared){ assert(pic->f.data[0]); - assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED); + assert(pic->f.type == 0 || pic->f.type == FF_BUFFER_TYPE_SHARED); pic->f.type = FF_BUFFER_TYPE_SHARED; }else{ assert(!pic->f.data[0]); |