From: Laurent Aimar <fenrir@videolan.org>
Date: Fri, 25 Jul 2008 20:28:43 +0000 (+0200)
Subject: Removed dead code + added a check against allocation errors.
X-Git-Tag: 0.9.0-test3~266
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=053b0208a015e79df412b4dcdd08fe0b58e291d1;hp=1dcdb30fe3d764d3cd5e66253b5db9e9b62909ed;p=vlc

Removed dead code + added a check against allocation errors.
---

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index eeb8d80fb4..6681a42048 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -232,8 +232,6 @@ static int Open( vlc_object_t *p_this )
             block_t *p_sps = nal_get_annexeb( p_dec, p, i_length );
             if( !p_sps )
                 return VLC_EGENERIC;
-            p_sys->p_sps = block_Duplicate( p_sps );
-            p_sps->i_pts = p_sps->i_dts = mdate();
             ParseNALBlock( p_dec, p_sps );
             p += i_length;
         }
@@ -250,14 +248,15 @@ static int Open( vlc_object_t *p_this )
             block_t *p_pps = nal_get_annexeb( p_dec, p, i_length );
             if( !p_pps )
                 return VLC_EGENERIC;
-            p_sys->p_pps = block_Duplicate( p_pps );
-            p_pps->i_pts = p_pps->i_dts = mdate();
             ParseNALBlock( p_dec, p_pps );
             p += i_length;
         }
         msg_Dbg( p_dec, "avcC length size=%d, sps=%d, pps=%d",
                  p_sys->i_avcC_length_size, i_sps, i_pps );
 
+        if( !p_sys->p_sps || p_sys->p_pps )
+            return VLC_EGENERIC;
+
         /* FIXME: FFMPEG isn't happy at all if you leave this */
         if( p_dec->fmt_out.i_extra > 0 ) free( p_dec->fmt_out.p_extra );
         p_dec->fmt_out.i_extra = 0;