diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 02:38:20 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 02:38:20 +0000 |
| commit | d999d7652db69a1c431ed1414f039b1caf156291 (patch) | |
| tree | 803c4cdfeb8771041da4b8d4fc11d77717b93004 /libmpcodecs | |
| parent | ebe578fc77daa10db239bdf6c66a2d35c591c2d9 (diff) | |
| download | mpv-d999d7652db69a1c431ed1414f039b1caf156291.tar.bz2 mpv-d999d7652db69a1c431ed1414f039b1caf156291.tar.xz | |
Now xvmc struct uses magic_id field
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28578 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 99834d05ad..862c1a776e 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -959,7 +959,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5)) mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer (render=%p)\n", render); assert(render != 0); - assert(render->magic == AV_XVMC_RENDER_MAGIC); + assert(render->magic_id == AV_XVMC_RENDER_MAGIC); render->state |= AV_XVMC_STATE_PREDICTION; return 0; } @@ -986,7 +986,7 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){ if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5)) mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_release_buffer (render=%p)\n", render); assert(render!=NULL); - assert(render->magic==AV_XVMC_RENDER_MAGIC); + assert(render->magic_id==AV_XVMC_RENDER_MAGIC); render->state&=~AV_XVMC_STATE_PREDICTION; for(i=0; i<4; i++){ pic->data[i]= NULL; |