diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 12:57:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 12:57:19 +0200 |
| commit | 208f9dd2ef06c5cfcb6ca494f35aba9149776e37 (patch) | |
| tree | 9bf67568f77314924d36df43ed471324ea4e73a5 /libavformat | |
| parent | c71541d42a599e2273bb4e6069435093783d6dd2 (diff) | |
| parent | d4aef997809167832ecc64e89dda8cb445e5fe10 (diff) | |
Merge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10'
* commit 'd4aef997809167832ecc64e89dda8cb445e5fe10':
rtmp: Follow Flash player numbering for channels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtmppkt.h | 4 | ||||
| -rw-r--r-- | libavformat/rtmpproto.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtmppkt.h b/libavformat/rtmppkt.h index 9ca6382a17..96ca1b68e8 100644 --- a/libavformat/rtmppkt.h +++ b/libavformat/rtmppkt.h @@ -36,9 +36,9 @@ enum RTMPChannel { RTMP_NETWORK_CHANNEL = 2, ///< channel for network-related messages (bandwidth report, ping, etc) RTMP_SYSTEM_CHANNEL, ///< channel for sending server control messages - RTMP_SOURCE_CHANNEL, ///< channel for sending a/v to server - RTMP_VIDEO_CHANNEL = 8, ///< channel for video data RTMP_AUDIO_CHANNEL, ///< channel for audio data + RTMP_VIDEO_CHANNEL = 6, ///< channel for video data + RTMP_SOURCE_CHANNEL = 8, ///< channel for a/v invokes }; /** diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 93dc1dfd2b..c4b4f28d46 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -690,7 +690,7 @@ static int gen_play(URLContext *s, RTMPContext *rt) av_log(s, AV_LOG_DEBUG, "Sending play command for '%s'\n", rt->playpath); - if ((ret = ff_rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, + if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SOURCE_CHANNEL, RTMP_PT_INVOKE, 0, 29 + strlen(rt->playpath))) < 0) return ret; @@ -2638,7 +2638,7 @@ static int rtmp_write(URLContext *s, const uint8_t *buf, int size) if (rt->flv_header_bytes < 11) { const uint8_t *header = rt->flv_header; int copy = FFMIN(11 - rt->flv_header_bytes, size_temp); - int channel = RTMP_SOURCE_CHANNEL; + int channel = RTMP_AUDIO_CHANNEL; bytestream_get_buffer(&buf_temp, rt->flv_header + rt->flv_header_bytes, copy); rt->flv_header_bytes += copy; size_temp -= copy; |