[FFmpeg-soc] [soc]: r4488 - in rtmp: rtmpdec.c rtmppkt.c
kostya
subversion at mplayerhq.hu
Thu Jun 18 07:05:42 CEST 2009
Author: kostya
Date: Thu Jun 18 07:05:42 2009
New Revision: 4488
Log:
cosmetics: break long lines
Modified:
rtmp/rtmpdec.c
rtmp/rtmppkt.c
Modified: rtmp/rtmpdec.c
==============================================================================
--- rtmp/rtmpdec.c Thu Jun 18 07:02:47 2009 (r4487)
+++ rtmp/rtmpdec.c Thu Jun 18 07:05:42 2009 (r4488)
@@ -98,7 +98,7 @@ static void gen_connect(AVFormatContext
rtmp_amf_write_tag(&p, AMF_STRING, app);
snprintf(ver, sizeof(ver), "%s %d,%d,%d,%d", RTMP_CLIENT_PLATFORM, RTMP_CLIENT_VER1,
- RTMP_CLIENT_VER2, RTMP_CLIENT_VER3, RTMP_CLIENT_VER4);
+ RTMP_CLIENT_VER2, RTMP_CLIENT_VER3, RTMP_CLIENT_VER4);
rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "flashVer");
rtmp_amf_write_tag(&p, AMF_STRING, ver);
rtmp_amf_write_tag(&p, AMF_STRING_IN_OBJECT, "tcUrl");
@@ -477,7 +477,8 @@ static int rtmp_read_packet(AVFormatCont
while (url_ftell(&rt->pb) == rt->flv_size) {
RTMPPacket rpkt;
int has_data = 0;
- if ((ret = rtmp_packet_read(s, rt->rtmp_hd, &rpkt, rt->chunk_size, rt->prev_pkt[0])) != 0) {
+ if ((ret = rtmp_packet_read(s, rt->rtmp_hd, &rpkt,
+ rt->chunk_size, rt->prev_pkt[0])) != 0) {
if (ret > 0) {
nanosleep(&ts, NULL);
continue;
@@ -495,7 +496,8 @@ static int rtmp_read_packet(AVFormatCont
rtmp_packet_destroy(&rpkt);
continue;
}
- if (rpkt.type == RTMP_PT_VIDEO || rpkt.type == RTMP_PT_AUDIO || rpkt.type == RTMP_PT_NOTIFY) {
+ if (rpkt.type == RTMP_PT_VIDEO || rpkt.type == RTMP_PT_AUDIO
+ || rpkt.type == RTMP_PT_NOTIFY) {
uint8_t *p;
rt->flv_size = rpkt.data_size + 15;
Modified: rtmp/rtmppkt.c
==============================================================================
--- rtmp/rtmppkt.c Thu Jun 18 07:02:47 2009 (r4487)
+++ rtmp/rtmppkt.c Thu Jun 18 07:05:42 2009 (r4488)
@@ -129,7 +129,8 @@ int rtmp_packet_read(AVFormatContext *ct
if (data_size > 0) {
url_read_complete(h, &t, 1); //marker
if (t != (0xC0 + stream_id)) {
- av_log(ctx, AV_LOG_ERROR, "Expected marker %02X, got %02X\n", t, 0xC0 + stream_id);
+ av_log(ctx, AV_LOG_ERROR, "Expected marker %02X, got %02X\n",
+ t, 0xC0 + stream_id);
return -1;
}
}
More information about the FFmpeg-soc
mailing list