[vlc-devel] commit: Revert "Partially work around a picture link in libmpeg2." ( Laurent Aimar )

git version control git at videolan.org
Tue Sep 2 00:27:19 CEST 2008


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Sep  1 23:40:01 2008 +0200| [575f49e51885b543128446ce99fbcb7d267edfe5] | committer: Laurent Aimar 

Revert "Partially work around a picture link in libmpeg2."

This reverts commit f18192c64b1f984c694d32e734a5b15d80b18ee0.
It fixed a few streams while breaking a few others one.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=575f49e51885b543128446ce99fbcb7d267edfe5
---

 modules/codec/libmpeg2.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 523a8ba..f0e3833 100644
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -466,13 +466,8 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             if( p_sys->p_info->discard_fbuf &&
                 p_sys->p_info->discard_fbuf->id )
             {
-
-                picture_t *p_old = p_sys->p_info->discard_fbuf->id;
-
-                if( p_old->i_status == RESERVED_PICTURE && p_old->date == 0 )
-                    p_dec->pf_vout_buffer_del( p_dec, p_old );
-                else
-                    p_dec->pf_picture_unlink( p_dec, p_old );
+                p_dec->pf_picture_unlink( p_dec,
+                                          p_sys->p_info->discard_fbuf->id );
             }
 
             /* For still frames */




More information about the vlc-devel mailing list