aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtmpproto.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-011-4/+228
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add support for limelight authentication rtmp: Add support for adobe authentication Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Add support for limelight authenticationMartin Storsjö2012-12-311-6/+75
| | | | | | | | | | | | | | | | | | Limelight is a not too uncommon CDN. The authentication scheme is pretty similar to the adobe authentication, but is even closer to normal http digest authentication (but not close enough to warrant sharing code) than the adobe version. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Add support for adobe authenticationMartin Storsjö2012-12-311-4/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly used to authenticate the client when publishing. Tested with wowza and akamai. Some but not all servers support resending a new connect invoke within the same connection, so always reconnect for sending a new connection attempt. This matches what other applications do as well. The authentication scheme is structurally pretty similar to http digest authentication, but uses base64 instead of hex strings. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a'Michael Niedermayer2013-01-011-1/+1
|\| | | | | | | | | | | | | | | * commit '33f28a3be3092f642778253d9529dd66fe2a014a': rtmp: Add a function for writing AMF strings based on two substrings rtmp: Return a proper error code in handle_invoke_error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Return a proper error code in handle_invoke_errorMartin Storsjö2012-12-311-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Use av_strlcat instead of strncatMartin Storsjö2012-11-051-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmpproto: Fix an out of array writeMichael Niedermayer2012-10-121-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | rtmpproto: Use av_strlcat instead of strncatMartin Storsjö2012-11-051-1/+1
| | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Fixes: [FFmpeg-devel] rtmpproto compile error Similar patch: [FFmpeg-devel] [PATCH] call to strncat replaced with av_strlcat to avoid compile issue with systems implementing strncat via strcat.
* | rtmp_write_amf_data: remove dead codeMichael Niedermayer2012-10-201-3/+0
| | | | | | | | | | Fixes CID732199 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'Michael Niedermayer2012-10-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e002e3291e6dc7953f843abf56fc14f08f238b21': Use the new aes/md5/sha/tree allocation functions avutil: Add functions for allocating opaque contexts for algorithms svq3: fix pointer type warning svq3: replace unsafe pointer casting with intreadwrite macros parseutils-test: various cleanups Conflicts: doc/APIchanges libavcodec/svq3.c libavutil/parseutils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use the new aes/md5/sha/tree allocation functionsMartin Storsjö2012-10-111-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | rtmpproto: fix out of array writeMichael Niedermayer2012-10-121-2/+2
| | | | | | | | | | Fixes CID732263 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtmpproto: reorder some expressions to fix compilation with clang without ↵Michael Niedermayer2012-09-121-6/+6
| | | | | | | | | | | | optimizations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-041-6/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-051-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union memberMartin Storsjö2012-09-041-3/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-231-4/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc/APIchanges: add an entry for codec descriptors. vorbisenc: set AVCodecContext.bit_rate to 0 vorbisenc: fix quality parameter FATE: add ALAC encoding tests lpc: fix alignment of windowed samples for odd maximum LPC order alacenc: use s16p sample format as input alacenc: remove unneeded sample_fmt check alacenc: fix max_frame_size calculation for the final frame adpcm_swf: Use correct sample offsets when using trellis. rtmp: support strict rtmp servers mjpegdec: support AVRn interlaced x86: remove FASTDIV inline asm Conflicts: doc/APIchanges libavcodec/mjpegdec.c libavcodec/vorbisenc.c libavutil/x86/intmath.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: support strict rtmp serversSamuel Pitoiset2012-08-221-4/+7
| | | | | | | | | | | | | | | | In order to send or receive a stream FCPublish, FCSubscribe and _checkbw are completely optional and often not implemented. releaseStream over a non-existen stream might report an error instead of being silent. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-171-5/+508
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libvpxenc: use the default bitrate if not set utvideo: Rename utvideo.c to utvideodec.c doc: Fix syntax errors in sample Emacs config mjpegdec: more meaningful return values configure: clean up Altivec detection getopt: Remove an unnecessary define rtmp: Use int instead of ssize_t getopt: Add missing includes rtmp: Add support for receiving incoming streams Add missing includes for code relying on external libraries Conflicts: libavcodec/libopenjpegenc.c libavcodec/libvpxenc.c libavcodec/mjpegdec.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-19 18:13:54 +0000