Mercurial > mplayer.hg

changeset 28554:36fbf025f4da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge two checks for mpi != NULL
author reimar
date Sun, 15 Feb 2009 13:17:04 +0000
parents 81931c7c0cf3
children 71232187cac5
files libmpcodecs/vd_ffmpeg.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c	Sun Feb 15 13:14:17 2009 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sun Feb 15 13:17:04 2009 +0000
@@ -653,11 +653,11 @@
             ctx->b_count--;
     }
 
-    // Palette support: free palette buffer allocated in get_buffer
-    if (mpi && (mpi->bpp == 8))
-        av_freep(&mpi->planes[1]);
+    if (mpi) {
+        // Palette support: free palette buffer allocated in get_buffer
+        if (mpi->bpp == 8)
+            av_freep(&mpi->planes[1]);
 #if CONFIG_XVMC
-    if (mpi) {
         if (IMGFMT_IS_XVMC(mpi->imgfmt)) {
             struct xvmc_pixfmt_render *render = (struct xvmc_pixfmt_render *)pic->data[2];//same as mpi->priv
             if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5))
@@ -666,8 +666,8 @@
             assert(render->magic_id==AV_XVMC_RENDER_MAGIC);
             render->state&=~AV_XVMC_STATE_PREDICTION;
         }
+#endif
     }
-#endif
 
     if(pic->type!=FF_BUFFER_TYPE_USER){
         avcodec_default_release_buffer(avctx, pic);