summaryrefslogtreecommitdiff
path: root/libavformat/rtmpdh.h
Commit message (Collapse)AuthorAge
* Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'Michael Niedermayer2015-06-01
|\ | | | | | | | | | | | | * commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505': rtmpdh: Use GMP functions directly, instead of nettle wrappers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Use GMP functions directly, instead of nettle wrappersMartin Storsjö2015-06-01
| | | | | | | | | | | | | | | | | | mpz_import and mpz_export were added in GMP 4.1, in 2002. This simplifies the DH code by clarifying that it only uses pure bignum functions, no other parts of nettle/hogweed. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | * commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214': rtmpdh: Fix the indentation in a struct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Fix the indentation in a structMartin Storsjö2015-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4': rtmpdh: Pass the actual buffer size of the output secret key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Pass the actual buffer size of the output secret keyMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-23
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* RTMPE protocol supportSamuel Pitoiset2012-07-23
This adds two protocols, but one of them is an internal implementation detail just used as an abstraction layer/generalization in the code. The RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the tcp:// protocol. This allows moving most of the lower level logic out from the higher level generic rtmp code. Signed-off-by: Martin Storsjö <martin@martin.st>