aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtmpproto.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * rtmp: Unbreak handle_notifyLuca Barbato2013-09-191-13/+14
| | | | | | | | Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
* | rtmp: Unbreak handle_notifyLuca Barbato2013-09-191-13/+14
| | | | | | | | Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-191-33/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5626f994f273af80fb100d4743b963304de9e05c': avformat: Use av_reallocp() where suitable Conflicts: libavformat/avidec.c libavformat/avienc.c libavformat/aviobuf.c libavformat/oggparsevorbis.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-181-33/+33
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '8583b14252deac71136f1dec231910abab0ba503'Michael Niedermayer2013-09-181-1/+4
|\| | | | | | | | | | | | | * commit '8583b14252deac71136f1dec231910abab0ba503': rtmp: Support reading interleaved chunks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Support reading interleaved chunks.Josh Allmann2013-09-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A given packet won't always come in contiguously; sometimes they may be broken up on chunk boundaries by packets of another channel. This support primarily involves tracking information about the data that's been read, so the reader can pick up where it left off for a given channel. As a side effect, we no longer over-report the bytes read if (toread = MIN(size, chunk_size)) == size Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6'Michael Niedermayer2013-09-181-1/+1
|\| | | | | | | | | | | | | * commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6': rtmpproto: Extend a comment to explain the prev_pkt arrays roles Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Extend a comment to explain the prev_pkt arrays rolesMartin Storsjö2013-09-171-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '647d655d19c38e9716328e4787199149097d6089'Michael Niedermayer2013-09-181-1/+1
|\| | | | | | | | | | | | | * commit '647d655d19c38e9716328e4787199149097d6089': rtmpproto: Consistently use the right prev_pkt array Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Consistently use the right prev_pkt arrayMartin Storsjö2013-09-171-1/+1
| | | | | | | | | | | | | | prev_pkt[0] is used for input packets, while prev_pkt[1] is used for output. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0d3784396b736374a61fea26268febdabd803a59'Michael Niedermayer2013-09-181-1/+1
|\| | | | | | | | | | | | | * commit '0d3784396b736374a61fea26268febdabd803a59': rtmpproto: Check for the right return code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Check for the right return codeMartin Storsjö2013-09-171-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-171-8/+8
|\| | | | | | | | | | | | | * qatar/master: rtmp: rename main_channel_id to stream_id. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: rename main_channel_id to stream_id.Josh Allmann2013-09-171-8/+8
| | | | | | | | | | | | | | This more closely corresponds to the usage of the field. Its usage here is unrelated to the channel ID. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10'Michael Niedermayer2013-09-171-2/+2
|\| | | | | | | | | | | | | * commit 'd4aef997809167832ecc64e89dda8cb445e5fe10': rtmp: Follow Flash player numbering for channels. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Follow Flash player numbering for channels.Josh Allmann2013-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | Channel 4 is typically used by the Flash player to transmit audio, channel 6 for video, and various stream-specific invokes get sent over channel 8, which is designated the source channel. This more closely matches the behavior of the Flash player, including the transmission of play requests over channel 8. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '120af23cd5fcfc539d9575d17d403247ab17109b'Michael Niedermayer2013-09-171-2/+6
|\| | | | | | | | | | | | | * commit '120af23cd5fcfc539d9575d17d403247ab17109b': rtmp: Send video on a separate channel. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Send video on a separate channel.Josh Allmann2013-09-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | Sending non-monotonic packets (e.g. when the audio and video streams are monotonic within themselves but not muxed monotonically) will lead to negative values the RTMP timestamp field (where timestamps are transmitted only as deltas for each channel), and this delta can end up being incorrectly written as a large unsigned number. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '92ed83e393d25b6d15920e90d56ee77de54a9728'Michael Niedermayer2013-09-171-30/+29
|\| | | | | | | | | | | | | * commit '92ed83e393d25b6d15920e90d56ee77de54a9728': rtmp: Store all the notify messages Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Store all the notify messagesLuca Barbato2013-09-161-30/+29
| | | | | | | | The onTextData is used to implement text data streams in flv.
* | Merge commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931'Michael Niedermayer2013-09-171-1/+1
|\| | | | | | | | | | | | | * commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931': rtmp: Do not send the first field twice within the handshake Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Do not send the first field twice within the handshakeLuca Barbato2013-09-161-1/+1
| |
* | Merge commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf'Michael Niedermayer2013-09-171-2/+0
|\| | | | | | | | | | | | | * commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf': rtmp: Drop an unneeded warning Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Drop an unneeded warningLuca Barbato2013-09-161-2/+0
| | | | | | | | | | Apparently a widely used streaming server requires that the second field always presents a version during C1 phase.
* | Merge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'Michael Niedermayer2013-09-171-1/+10
|\| | | | | | | | | | | | | * commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825': rtmp: Support play method in listen mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Support play method in listen modeLuca Barbato2013-09-161-1/+10
| |
* | Merge commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a'Michael Niedermayer2013-09-171-43/+75
|\| | | | | | | | | | | | | * commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a': rtmp: Factor out publish specific code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Factor out publish specific codeLuca Barbato2013-09-161-43/+75
| | | | | | | | Will be reused for supporting play.
* | Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'Michael Niedermayer2013-08-291-0/+2
|\| | | | | | | | | | | | | * commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa': rtmpproto: Fix limelight authentication with abbreviated app names Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Fix limelight authentication with abbreviated app namesMartin Storsjö2013-08-281-0/+2
| | | | | | | | | | | | | | | | | | When streaming to limelight, the app name is either a full "appname/subaccount" or "appname/_definst_". In the latter case, the app name can be simplified into simply "appname", but the authentication hashing assumes the /_definst_ still to be present. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-111-12/+13
|\| | | | | | | | | | | | | * qatar/master: rtmp: Do not misuse memcmp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Do not misuse memcmpLuca Barbato2013-08-111-12/+13
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '8e1fe345577a42f99591caf8a06c447613449694'Michael Niedermayer2013-08-111-0/+7
|\| | | | | | | | | | | | | * commit '8e1fe345577a42f99591caf8a06c447613449694': rtmp: Detect and warn if the user tries to pass librtmp style parameters Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Detect and warn if the user tries to pass librtmp style parametersMartin Storsjö2013-08-101-0/+7
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'Michael Niedermayer2013-08-111-35/+35
|\| | | | | | | | | | | | | * commit 'ba5393a609c723ec8ab7f9727c10fef734c09278': rtmp: rename data_size to size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: rename data_size to sizeLuca Barbato2013-08-101-35/+35
| |
* | Merge commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b'Michael Niedermayer2013-08-111-3/+5
|\| | | | | | | | | | | | | * commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b': rtmp: Use PRId64 when needed. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Use PRId64 when needed.Luca Barbato2013-08-101-3/+5
| |
* | Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'Michael Niedermayer2013-08-031-0/+55
|\| | | | | | | | | | | | | | | | | | | | | * commit '0d6fa3977b016f1b72b0b24b8834ff9222498548': rtmp: Add seek support Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Add seek supportGavriloaie Eugen-Andrei2013-08-021-0/+55
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'Michael Niedermayer2013-06-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f': network: factor out bind-listening code use my full first name instead of short one in copyrights Conflicts: libavformat/tcp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * use my full first name instead of short one in copyrightsKostya Shishkov2013-06-011-1/+1
| |
* | Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer2013-05-161-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-161-2/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-201-1/+1
|\| | | | | | | | | | | | | * qatar/master: rtmp: Pass the parameters to do_adobe_auth in the right order Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Pass the parameters to do_adobe_auth in the right orderMartin Storsjö2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | do_adobe_auth takes the parameters in the order "opaque, challenge". Due to the way they are treated, this didn't matter in the tested setups though - if both are set, we only use one. In the tested setups (Wowza and Akamai) either one of them were null or they were both set to the same value, which is why this worked before. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmpproto: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | rtmpproto: increase APP_MAX_LENGTHMichael Niedermayer2013-02-231-2/+2
| | | | | | | | | | | | Fixes second part of Ticket2292 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtmpproto: Check APP_MAX_LENGTHMichael Niedermayer2013-02-231-2/+6
| | | | | | | | | | | | Fixes Ticket2292 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtmpproto: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-10 22:07:48 +0000