[vlc-devel] commit: Do not use playlist inside a decoder. (Laurent Aimar )

git version control git at videolan.org
Sat Nov 22 16:37:59 CET 2008


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Nov 22 10:50:24 2008 +0100| [09af6e91f7b4484416a2d4750892e99db3ea2135] | committer: Laurent Aimar 

Do not use playlist inside a decoder.

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

 modules/codec/vorbis.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 312951d..f7a9078 100644
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -36,7 +36,6 @@
 #include <vlc_codec.h>
 #include <vlc_aout.h>
 #include <vlc_input.h>
-#include <vlc_playlist.h>
 #include <vlc_sout.h>
 
 #include <ogg/ogg.h>
@@ -611,7 +610,8 @@ static void ParseVorbisComments( decoder_t *p_dec )
     input_item_t *p_item;
     int i = 0;
 
-    if( p_input->i_object_type != VLC_OBJECT_INPUT ) return;
+    if( p_input->i_object_type != VLC_OBJECT_INPUT )
+        return;
 
     p_item = input_GetItem( p_input );
 
@@ -685,8 +685,6 @@ static void ParseVorbisComments( decoder_t *p_dec )
                 r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
             }
         }
-        var_SetInteger( pl_Hold( p_input ), "item-change", p_item->i_id );
-        pl_Release( p_input );
         free( psz_comment );
         i++;
     }




More information about the vlc-devel mailing list