summaryrefslogtreecommitdiffstats
path: root/libavformat/rtmpproto.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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 <[email protected]>
| * 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ö <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-111-12/+13
|\| | | | | | | | | | | | | * qatar/master: rtmp: Do not misuse memcmp Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Do not misuse memcmpLuca Barbato2013-08-111-12/+13
| | | | | | | | CC: [email protected]
* | 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 <[email protected]>
| * rtmp: Detect and warn if the user tries to pass librtmp style parametersMartin Storsjö2013-08-101-0/+7
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'Michael Niedermayer2013-08-111-35/+35
|\| | | | | | | | | | | | | * commit 'ba5393a609c723ec8ab7f9727c10fef734c09278': rtmp: rename data_size to size Merged-by: Michael Niedermayer <[email protected]>
| * 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 <[email protected]>
| * 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 <[email protected]>
| * rtmp: Add seek supportGavriloaie Eugen-Andrei2013-08-021-0/+55
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | 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 <[email protected]>
| * 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 <[email protected]>
| * 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 <[email protected]>
| * 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ö <[email protected]>
| * rtmpproto: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | rtmpproto: increase APP_MAX_LENGTHMichael Niedermayer2013-02-231-2/+2
| | | | | | | | | | | | Fixes second part of Ticket2292 Signed-off-by: Michael Niedermayer <[email protected]>
* | rtmpproto: Check APP_MAX_LENGTHMichael Niedermayer2013-02-231-2/+6
| | | | | | | | | | | | Fixes Ticket2292 Signed-off-by: Michael Niedermayer <[email protected]>
* | rtmpproto: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
| * 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ö <[email protected]>
| * 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ö <[email protected]>
* | 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 <[email protected]>
| * rtmp: Return a proper error code in handle_invoke_errorMartin Storsjö2012-12-311-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * rtmp: Use av_strlcat instead of strncatMartin Storsjö2012-11-051-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * rtmpproto: Fix an out of array writeMichael Niedermayer2012-10-121-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | rtmpproto: Use av_strlcat instead of strncatMartin Storsjö2012-11-051-1/+1
| | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> 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 <[email protected]>
* | 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 <[email protected]>
| * Use the new aes/md5/sha/tree allocation functionsMartin Storsjö2012-10-111-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | rtmpproto: fix out of array writeMichael Niedermayer2012-10-121-2/+2
| | | | | | | | | | Fixes CID732263 Signed-off-by: Michael Niedermayer <[email protected]>
* | rtmpproto: reorder some expressions to fix compilation with clang without ↵Michael Niedermayer2012-09-121-6/+6
| | | | | | | | | | | | optimizations Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-041-6/+6
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | 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 <[email protected]>
| * avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union memberMartin Storsjö2012-09-041-3/+3
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | 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 <[email protected]>
| * 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 <[email protected]>
* | 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 <[email protected]>
| * rtmp: Use int instead of ssize_tMartin Storsjö2012-08-161-3/+3
| | | | | | | | | | | | | | Not all compilers support ssize_t (MSVC doesn't), and none of these variables need to be larger than 32 bit. Signed-off-by: Martin Storsjö <[email protected]>
| * rtmp: Add support for receiving incoming streamsJordi Ortiz2012-08-161-5/+508
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+134
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Automatically compute the hash for SWFVerificationSamuel Pitoiset2012-08-151-0/+134
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-151-5/+83
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add support for SWFVerification api-example: use new video encoding API. x86: avcodec: Appropriately name files containing only init functions mpegvideo_mmx_template: drop some commented-out cruft libavresample: add mix level normalization option w32pthreads: Add missing #includes to make header compile standalone rtmp: Gracefully ignore _checkbw errors by tracking them rtmp: Do not send _checkbw calls as notifications prores: interlaced ProRes encoding Conflicts: doc/examples/decoding_encoding.c libavcodec/proresenc_kostya.c libavcodec/w32pthreads.h libavcodec/x86/Makefile libavformat/version.h Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Add support for SWFVerificationSamuel Pitoiset2012-08-151-0/+66
| | | | | | | | | | | | | | | | | | Specifies how the server verifies client SWF files before allowing the files to connect to an application. Verifying SWF files is a security measure that prevents someone from creating their own SWF files that can attempt to stream your resources. Signed-off-by: Martin Storsjö <[email protected]>
| * rtmp: Gracefully ignore _checkbw errors by tracking themSamuel Pitoiset2012-08-141-4/+16
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 07:21:58 +0000