[vlc-devel] commit: RTMP: small cleanup ( Rémi Denis-Courmont )

git version control git at videolan.org
Tue Nov 17 20:35:18 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 17 21:15:41 2009 +0200| [600ceaf9816eb8e82f480ad59ea7f64996c35925] | committer: Rémi Denis-Courmont 

RTMP: small cleanup

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

 modules/access/rtmp/rtmp_amf_flv.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/rtmp/rtmp_amf_flv.c b/modules/access/rtmp/rtmp_amf_flv.c
index 26f25bd..3926fd8 100644
--- a/modules/access/rtmp/rtmp_amf_flv.c
+++ b/modules/access/rtmp/rtmp_amf_flv.c
@@ -894,7 +894,7 @@ rtmp_read_net_packet( rtmp_control_thread_t *p_thread )
         if( i_ret != 1 )
             goto error;
 
-        length_header = rtmp_decode_header_size( (vlc_object_t *) p_thread,
+        length_header = rtmp_decode_header_size( VLC_OBJECT(p_thread),
                                           p_read[0] & RTMP_HEADER_SIZE_MASK );
         stream_index = p_read[0] & RTMP_HEADER_STREAM_INDEX_MASK;
         header = p_thread->rtmp_headers_recv+stream_index;
@@ -956,7 +956,7 @@ rtmp_read_net_packet( rtmp_control_thread_t *p_thread )
         if( header->length_body == header->body->length_body )
         {
             rtmp_packet_t *rpkt = (rtmp_packet_t*)malloc(sizeof(rtmp_packet_t));
-            if( !rpkt ) goto error;
+            if( !rpkt ) return NULL;
 
             rpkt->stream_index       = stream_index;
             rpkt->timestamp          = header->timestamp;




More information about the vlc-devel mailing list