diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 22:02:24 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 22:02:24 +0000 |
| commit | a452d22384f295e06be0bbf6c22e1f0e95c8dd05 (patch) | |
| tree | d09dd39ca27fe7811261adba4d6a512fef425ad6 /libmpcodecs | |
| parent | 33f7ff9403a86783d3732d291c88b72dfc69e7a8 (diff) | |
| download | mpv-a452d22384f295e06be0bbf6c22e1f0e95c8dd05.tar.bz2 mpv-a452d22384f295e06be0bbf6c22e1f0e95c8dd05.tar.xz | |
The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28608 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 4e718c2650..c026ccfc37 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -594,7 +594,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5)) mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::get_buffer (xvmc render=%p)\n", render); assert(render != 0); - assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC); + assert(render->xvmc_id == AV_XVMC_ID); render->state |= AV_XVMC_STATE_PREDICTION; } #endif @@ -683,7 +683,7 @@ static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5)) mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::release_buffer (xvmc render=%p)\n", render); assert(render!=NULL); - assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC); + assert(render->xvmc_id == AV_XVMC_ID); render->state&=~AV_XVMC_STATE_PREDICTION; } #endif |