generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,049 Commits 24 Branches 241 Tags 173 MiB
a49154e9d7
Commit Graph

17675 Commits

Author SHA1 Message Date
James Almer
b380337020 mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail 
The first check is done without the AVIOContext, so alloc it only if said check succeeds

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2015-06-09 10:07:11 +02:00
Rodger Combs
ecefce41d9 lavf/tls_securetransport: fix SNI support when not verifying 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-09 01:06:32 +02:00
James Almer
1382add59d mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail 
The first check is done without the AVIOContext, so alloc it only if said check succeeds

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-08 18:26:42 -03:00
Michael Niedermayer
d5a645625d Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef' 
* commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef':
  rtpdec_asf: Check memory allocation and free memory on error

Conflicts:
	libavformat/rtpdec_asf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 23:05:01 +02:00
Michael Niedermayer
3d6635749a Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5' 
* commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5':
  mov: Check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 22:56:51 +02:00
Michael Niedermayer
d1f7b313ac Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383' 
* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
  audiointerleave: Always initialize new_pkt

Conflicts:
	libavformat/audiointerleave.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 22:37:41 +02:00
Michael Niedermayer
01a6ae1396 Merge commit '8ef98855d25e457094468e2e1a79d9b10d6445b2' 
* commit '8ef98855d25e457094468e2e1a79d9b10d6445b2':
  sctp: Always initialize outmsg struct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 22:35:53 +02:00
Michael Niedermayer
402b18afcc Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977' 
* commit 'caf7be30b11288c498fae67be4741bfbf083d977':
  mpjpgdec: free AVIOContext leak on early probe fail

Conflicts:
	libavformat/mpjpegdec.c

See: 34d278f983, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 22:15:28 +02:00
James Almer
34d278f983 mpjpegdec: fix memory leak in probe function 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-08 16:03:31 -03:00
Rodger Combs
6dd5371e34 lavf/tls: let the user specify what name to verify against 
This can be useful for debugging, or in scenarios where the user
doesn't want to use the system's DNS settings for whatever reason.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 14:08:52 +02:00
Vittorio Giovara
4733a12dd1 rtpdec_asf: Check memory allocation and free memory on error 
CC: libav-stable@libav.org
Bug-Id: CID 1257774
 2015-06-08 13:04:29 +01:00
Vittorio Giovara
6308cd4868 mov: Check memory allocation 
CC: libav-stable@libav.org
Bug-Id: CID 1292518
 2015-06-08 13:03:39 +01:00
Vittorio Giovara
f7e9324733 audiointerleave: Always initialize new_pkt 
CC: libav-stable@libav.org
Bug-Id: CID 609333
 2015-06-08 13:03:10 +01:00
Vittorio Giovara
8ef98855d2 sctp: Always initialize outmsg struct 
CC: libav-stable@libav.org
Bug-Id: CID 1302711
 2015-06-08 13:01:33 +01:00
Janne Grunau
caf7be30b1 mpjpgdec: free AVIOContext leak on early probe fail 2015-06-08 13:55:26 +02:00
Michael Niedermayer
7630cce4b3 avformat/mxfenc: Allow overriding /manual setting of the signal standard 
previous patch reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 13:03:29 +02:00
Michael Niedermayer
ac2dad9690 avformat/version: Bump version for single jpeg muxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 04:00:45 +02:00
Caligula useraccount
51ac1f616f avformat: Add single jpeg muxer 
Needed to fix Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 03:36:22 +02:00
Michael Niedermayer
ce838ad950 Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897' 
* commit '252d6200c36e7eaa79f8d5205b7d731179e94897':
  avio: Add avio_put_str16be

Conflicts:
	doc/APIchanges
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/version.h

The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 01:17:26 +02:00
Michael Niedermayer
8985e7c561 Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105' 
* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 00:44:28 +02:00
Michael Niedermayer
7856afef52 avformat/hdsenc: Change duration from single to to double precision 
This slightly improves precision

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 00:35:43 +02:00
Michael Niedermayer
0dbea4642f avformat/rmenc: Remove float usage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 21:55:46 +02:00
Michael Niedermayer
0023ea4e20 avformat/aviobuf: Check for ffio_set_buf_size() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 14:57:36 +02:00
Michael Niedermayer
dc55477a64 avformat/ffmdec: Check ffio_set_buf_size() return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 14:55:10 +02:00
Luca Barbato
252d6200c3 avio: Add avio_put_str16be 2015-06-07 10:14:45 +02:00
Luca Barbato
9b56ac74b1 mpjpeg: Initial implementation 
Support only streams with Content-Length.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-07 10:14:45 +02:00
Stephan Holljes
44d1921200 lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:24:50 +02:00
Stephan Holljes
290b237556 lavf/http: Indent else-clause. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:24:50 +02:00
Stephan Holljes
a7e7c68b0e lavf/http: Properly process HTTP header on listen. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:24:50 +02:00
Stephan Holljes
8cfaa76a5e lavf/http: Rudimentary error handling for HTTP requests received from clients. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:24:43 +02:00
Stephan Holljes
bbcee92b6d lavf/http: Process HTTP header before sending response. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:13:42 +02:00
Stephan Holljes
aa74401af8 lavf/http: Document method option. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:13:41 +02:00
Michael Niedermayer
f07376402c avformat/mxfenc: Add mxf muxer avclass 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 02:39:01 +02:00
Michael Niedermayer
42c41e96ff avformat/utils: Do not select audio streams with unknown sample rate in av_find_best_stream() 
Together with the next commit this prevents non-PCM S302M from being selected unless either
it can be decoded or the user selects passthrough/copy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 01:02:43 +02:00
Ganesh Ajjanagadde
a86928d2ab flvdec: fix lack of duration for some files 
Fixes #4579

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-05 21:56:09 +02:00
Michael Niedermayer
108b738db1 avformat/flvdec: Show unknown tags at debug level 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-05 21:56:09 +02:00
Michael Niedermayer
790a3cdf76 avformat/flvdec: Add TYPE_ONCAPTIONINFO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-05 21:56:09 +02:00
Michael Niedermayer
b2fecce3c1 avformat/flvdec: increase buffer size for parsing metadata string key 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-05 21:55:45 +02:00
Vignesh Venkatasubramanian
7be0f48a32 lavf/matroskaenc: Write Block Keyframe correctly 
Per matroska Block Structure [1], for keyframes 0th bit of the flag
should not be set (unlike SimpleBlocks). For Blocks, keyframes is
inferred by the absence of ReferenceBlock element (as done by
matroskadec). This CL writes the flag correctly and inserts the
ReferenceBlock element for non-keyframes. The timestamp inserted is
that of the immediately preceding frame (which is true for VP8 and VP9
- the only 2 codecs using the matroska block element as of now). It
also considers all non-video frames (audio, subtitles, metadata) to
be keyframes.

[1] http://www.matroska.org/technical/specs/index.html#block_structure

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-05 02:48:04 +02:00
Juanjo
a213e57cef lavf/riffenc: Set correct block align for mp2. 
Rounding by Michael.

Fixes ticket #4565.
 2015-06-04 17:03:34 +02:00
Michael Niedermayer
3e34b7498f Revert "avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference" 
This was simply wrong

Found-by: Martin Storsjö
This reverts commit 5d8e4f6da0.
 2015-06-03 22:39:27 +02:00
Michael Niedermayer
9614df4b15 avformat/mov: Retry same packet on IO failure to avoid loosing a packet 
Based on patch by: Zhang Rui <bbcallen@gmail.com>
Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 17:37:09 +02:00
Michael Niedermayer
d7a762553c avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/sec 
This is the maximum rate possible based on the frame size limit of MXF D-10

Previous version reviewed by tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 12:12:34 +02:00
Michael Niedermayer
ce4e57dbb5 avformat/sbgdec: Check alloc_array_elem() return value 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 16:42:33 +02:00
Michael Niedermayer
e43f3c8858 avformat/mxfdec: return error instead of segfaulting if there are no streams 
Fixes segfault from ticket 4350

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 13:45:47 +02:00
Michael Niedermayer
627dd7fe7e avformat/movenc: Fix potential signed overflows 
Fixes CID1302838

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 17:54:58 +02:00
Michael Niedermayer
2e92a27a90 avformat/mxfenc: Correct klv_fill_key 
See SMPTE 377-1-2009 6.3.3 KLV Fill Items

Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 15:31:04 +02:00
Michael Niedermayer
589d39c768 Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505' 
* commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505':
  rtmpdh: Use GMP functions directly, instead of nettle wrappers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 11:29:05 +02:00
Michael Niedermayer
8939667b70 Merge commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214' 
* commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214':
  rtmpdh: Fix the indentation in a struct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 11:28:01 +02:00
Martin Storsjö
63ce9fd23c rtmpdh: Use GMP functions directly, instead of nettle wrappers 
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>
 2015-06-01 10:38:54 +03:00
Martin Storsjö
84c5ff911f rtmpdh: Fix the indentation in a struct 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-06-01 10:38:54 +03:00
Michael Niedermayer
1e0c34fe71 avformat/utils: Simplify get_std_framerate() check 
This also avoids using a floating point operation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 04:31:37 +02:00
Michael Niedermayer
9e1cdfb89b Merge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d' 
* commit '5c720657c23afd798ae0db7c7362eb859a89ab3d':
  mov: always check avio_read return value

Conflicts:
	libavformat/mov.c

See: b71528d896
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:59:44 +02:00
Michael Niedermayer
ebab902a1c Merge commit 'bff0349d9da527084e1433167466d8afc9e25c7f' 
* commit 'bff0349d9da527084e1433167466d8afc9e25c7f':
  avio: Add avio_read wrapper to simplify error checking

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:43:50 +02:00
Michael Niedermayer
348319f543 Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c' 
* commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c':
  mov: Correctly allocate ctts_data

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:35:39 +02:00
Gilles Chanteperdrix
d61386a690 avformat/libquvi: fix error handling 
avoid calling cleanup functions on uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 19:04:52 +02:00
Andreas Cadhalpun
5c720657c2 mov: always check avio_read return value 
If avio_read fails, the buffer can contain uninitialized data.

This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings, and addresses a few memleaks.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 13:05:13 +02:00
Vittorio Giovara
bff0349d9d avio: Add avio_read wrapper to simplify error checking 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 13:05:13 +02:00
Luca Barbato
a8a90906fb mov: Correctly allocate ctts_data 
It can be reallocated.

CC: libav-stable@libav.org
 2015-05-31 13:05:12 +02:00
Andreas Cadhalpun
cffb9ea81b mov: reject zero bytes_per_frame with non-zero samples_per_frame 
In this case the mov demuxer can return a large number of empty packets.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 13:05:12 +02:00
Andreas Cadhalpun
f261a55d72 mov: Fix two memleaks 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org
 2015-05-31 13:05:12 +02:00
Andreas Cadhalpun
8e9c39e81f mov: abort on EOF in ff_mov_read_chan 
Otherwise the loop can take a lot of time if num_descr is very large.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 13:05:12 +02:00
wm4
881b80b329 network: prevent SIGPIPE on OSX 
OSX does not know MSG_NOSIGNAL. BSD (which OSX is based on) has got
the socket option SO_NOSIGPIPE (even if modern BSDs also support
MSG_NOSIGNAL).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-31 10:10:16 +03:00
wm4
c41e0aedf5 network: prevent SIGPIPE on OSX 
OSX does not know MSG_NOSIGNAL, and provides its own non-standard
mechanism instead. I guess Apple hates standards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 22:29:19 +02:00
Michael Niedermayer
a3ec1d6abd avformat/movenc: Add loction/xyz support to allow copying data between mov files 
Fixes Ticket4337

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 16:44:05 +02:00
Michael Niedermayer
08b7d19def avformat/mov: Also export loci altitude 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 15:28:31 +02:00
Michael Niedermayer
1607f77494 avformat/mov: Append place name instead of overwriting for loci 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 15:23:19 +02:00
Rodger Combs
4dd22531fd lavf/tls_securetransport: add missing copyright notice 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 12:01:22 +02:00
Michael Niedermayer
aa9c6b6986 avformat/h264dec: Add ff_tlog() with trace information about h264 probing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 03:57:20 +02:00
Michael Niedermayer
dae89802a6 avformat/h264dec: Fix detection of invalid h264 with 0x100 startcodes 
Fies Ticket4325

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 03:53:32 +02:00
Michael Niedermayer
2e15f07cfd Merge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6' 
* commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6':
  rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 00:59:57 +02:00
Martin Storsjö
b2f0f37d24 rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp 
Don't use a PRNG for generating it; that defies the intended use
within the cryptograhic handshake.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-29 23:33:03 +03:00
Rodger Combs
f24d92bada lavf/tls: Support Secure Transport 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 21:52:27 +02:00
Andreas Cadhalpun
153639cb9c mov: fix DTS calculation for samples with negative stts duration 
A negative sample duration is invalid according to the spec, but there
are samples that use it for the DTS calculation, e.g.:
http://files.1f0.de/samples/mp4-negative-stts-problem.mp4

These currently get out of A/V sync.

Also change the logging type to AV_LOG_WARNING, because decoding the
sample can continue.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-29 19:35:58 +02:00
Michael Niedermayer
061a592b9c avformat/movenc: Check that track_width_1616 fits within the available 32bit before storing it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 12:54:37 +02:00
Michael Niedermayer
14bc570442 avformat/movenc: avoid floats in width/height/aspect ratio computations 
This avoids the possibility for rounding/precision differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 12:46:58 +02:00
Michael Niedermayer
3331213e2a avformat/concatdec: Enable auto_convert by default 
Users have no means to find out from a failure how to make it work
or is it preferred to check and print a warning for h264 concat without auto_convert ?

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 12:19:47 +02:00
Michael Niedermayer
e1b0019568 avformat/mov: Avoid float usage in yuv_to_rgba() 
This avoids the possibility for rounding/precision differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 12:16:08 +02:00
Michael Niedermayer
4b8b3efb1e Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1' 
* commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1':
  rtmpdh: Create sufficiently long private keys for gcrypt/nettle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 11:42:43 +02:00
Michael Niedermayer
42a6a38418 Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286' 
* commit '8016a1bd3b60e917e1b12748dd80c06c3462c286':
  rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 11:42:22 +02:00
Michael Niedermayer
48e02e258c Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53' 
* commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53':
  rtmpdh: Add fate test for the DH handshake routine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 11:38:37 +02:00
Michael Niedermayer
fbeb3fa999 Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4' 
* commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4':
  rtmpdh: Pass the actual buffer size of the output secret key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 11:32:07 +02:00
Michael Niedermayer
beecbe13a2 Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b' 
* commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b':
  rtmpdh: Check the output buffer size in the openssl version of dh_compute_key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 11:31:43 +02:00
Michael Niedermayer
4c0b30b07a Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14' 
* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14':
  rtmpdh: Fix a local variable name in the nettle/gcrypt codepath

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 11:31:26 +02:00
Michael Niedermayer
392832fc3a Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04' 
* commit '78efc69e7c990226f4b913721ef1b308ca5bfa04':
  rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 11:21:35 +02:00
Martin Storsjö
e9e86d9ef6 rtmpdh: Create sufficiently long private keys for gcrypt/nettle 
There was a misunderstanding betewen bits and bytes for the parameter
value for generating random big numbers.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-29 09:42:41 +03:00
Martin Storsjö
8016a1bd3b rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-29 09:42:38 +03:00
Martin Storsjö
063f7467e4 rtmpdh: Add fate test for the DH handshake routine 
This helps if these functions need to be implemented using another
crypto API.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-29 09:42:35 +03:00
Martin Storsjö
0508faaa11 rtmpdh: Pass the actual buffer size of the output secret key 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-29 09:42:32 +03:00
Martin Storsjö
9f1b3050d9 rtmpdh: Check the output buffer size in the openssl version of dh_compute_key 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-29 09:42:30 +03:00
Martin Storsjö
127d813bcb rtmpdh: Fix a local variable name in the nettle/gcrypt codepath 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-29 09:42:28 +03:00
Martin Storsjö
78efc69e7c rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-29 09:42:24 +03:00
Roman Savchenko
e85d91da48 avformat/avienc: Correct possible dereference of null 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 00:04:41 +02:00
Michael Niedermayer
f0b99112e3 Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1' 
* commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1':
  tls_gnutls: Add missing includes for the gcrypt thread safety callbacks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-28 21:21:07 +02:00
Michael Niedermayer
b06e82e738 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavc/x264: Support bgr0 as input pix_fmt.
  lavf: Use av_codec_get_tag2() in avformat_query_codec().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-28 14:12:46 +02:00
Martin Storsjö
d4d90504a6 tls_gnutls: Add missing includes for the gcrypt thread safety callbacks 
This fixes building with gcrypt-backed gnutls versions, broken
in 57cde2b180.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-28 15:05:52 +03:00
Michael Niedermayer
5a3d2541bd avformat/mxfenc: Support storing signal standard for D10 muxing 
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-28 12:36:08 +02:00
Carl Eugen Hoyos
57eecd9e4f lavf: Use av_codec_get_tag2() in avformat_query_codec(). 
av_codec_get_tag() can return 0 both in case of error and success.
 2015-05-28 12:31:40 +02:00
Timothy Gu
7206b94fb8 network: Move variable declaration under an #if 
Avoids an unused variable warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-28 03:06:05 +02:00
wm4
a9f1d584e5 lavf: move TLS-related ifdeffery to library specific files 
There is no need to have this mess in network.c.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 22:24:00 +02:00