diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 17:35:24 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-15 17:35:24 +0000 |
| commit | 0c4e65f15a8c1f78ae6939991b9b5e7954e53671 (patch) | |
| tree | ce12a3fc6ae79f0a151664a5d08233d19c198708 /libmpcodecs | |
| parent | b2c338819eab435aa451dce4c570c943344b6cb3 (diff) | |
| download | mpv-0c4e65f15a8c1f78ae6939991b9b5e7954e53671.tar.bz2 mpv-0c4e65f15a8c1f78ae6939991b9b5e7954e53671.tar.xz | |
The xmvc structure member magic_id was renamed to unique_id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28601 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 7352c61f62..df84b4d623 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->magic_id == AV_XVMC_RENDER_MAGIC); + assert(render->unique_id == AV_XVMC_RENDER_MAGIC); 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->magic_id==AV_XVMC_RENDER_MAGIC); + assert(render->unique_id == AV_XVMC_RENDER_MAGIC); render->state&=~AV_XVMC_STATE_PREDICTION; } #endif |