Changeset 9f427214afc526023b6841c527811add76b0bdd3

Timestamp:

05/10/08 19:20:51 (4 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1210440051 +0200

git-parent:

[5c5e00162b13ee769e0dbd090057a70cfbd1218e]

git-author:

Miguel Angel Cabrera Moya <madmac2501@gmail.com> 1210279380 +0200

Message:

Fixed error handling in function

Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>

Files:

• modules/access/rtmp/rtmp_amf_flv.c (modified) (12 diffs)

modules/access/rtmp/rtmp_amf_flv.c

@@ -229 +229 @@
-static void rtmp_handler_null       ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
-static void rtmp_handler_chunk_size ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
-int
+void
-static void rtmp_handler_audio_data ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
-static void rtmp_handler_video_data ( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
@@ -1119 +1119 @@
-}
-
-int
+void
-rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet )
-{
@@ -1149 +1149 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send connection bandwith" );
-return VLC_EGENERIC
+goto error
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1169 +1165 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send server bandwith" );
-return VLC_EGENERIC
+goto error
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1189 +1181 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send clear stream" );
-return VLC_EGENERIC
+goto error
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1209 +1197 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send reply NetConnection.connect" );
-return VLC_EGENERIC
+goto error
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1234 +1218 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send reply createStream" );
-return VLC_EGENERIC; 
+goto error;
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1254 +1234 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send reset stream" );
-return VLC_EGENERIC
+goto error
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1274 +1250 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send clear stream" );
-return VLC_EGENERIC
+goto error
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1316 +1288 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send reply NetStream.play.reset" );
-return VLC_EGENERIC
+goto error
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1336 +1304 @@
-        if( i_ret != tmp_rtmp_packet->length_encoded )
-        {
-            free( tmp_rtmp_packet->body->body );
-            free( tmp_rtmp_packet->body );
-            free( tmp_rtmp_packet );
-            free( tmp_buffer );
-            msg_Err( p_thread, "failed send reply NetStream.play.start" );
-return VLC_EGENERIC
+goto error
-        }
-        free( tmp_rtmp_packet->body->body );
@@ -1473 +1437 @@
-    free( rtmp_packet->body );
-    free( rtmp_packet );
-
+
+
+
+
+
+
+
+
-}
-