aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
| * rtmpdh: Pass the actual buffer size of the output secret keyMartin Storsjö2015-05-293-5/+8
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'Michael Niedermayer2015-05-291-1/+8
|\| | | | | | | | | | | | | * commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b': rtmpdh: Check the output buffer size in the openssl version of dh_compute_key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Check the output buffer size in the openssl version of dh_compute_keyMartin Storsjö2015-05-291-1/+8
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'Michael Niedermayer2015-05-291-3/+3
|\| | | | | | | | | | | | | * commit '127d813bcb5705202b7100cf1eccd1e26d72ba14': rtmpdh: Fix a local variable name in the nettle/gcrypt codepath Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Fix a local variable name in the nettle/gcrypt codepathMartin Storsjö2015-05-291-3/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'Michael Niedermayer2015-05-291-0/+2
|\| | | | | | | | | | | | | * commit '78efc69e7c990226f4b913721ef1b308ca5bfa04': rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bnMartin Storsjö2015-05-291-0/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/avienc: Correct possible dereference of nullRoman Savchenko2015-05-291-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'Michael Niedermayer2015-05-281-0/+1
|\| | | | | | | | | | | | | * commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1': tls_gnutls: Add missing includes for the gcrypt thread safety callbacks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls_gnutls: Add missing includes for the gcrypt thread safety callbacksMartin Storsjö2015-05-281-0/+1
| | | | | | | | | | | | | | This fixes building with gcrypt-backed gnutls versions, broken in 57cde2b180. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: move TLS-related ifdeffery to library specific fileswm42015-05-264-86/+109
| | | | | | | | | | | | There is no need to have this mess in network.c. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: split tls.cwm42015-05-267-363/+534
| | | | | | | | | | | | | | | | Move the OpenSSL and GnuTLS implementations to their own files. Other than the connection code (including options) and some boilerplate, no code is actually shared. Signed-off-by: Martin Storsjö <martin@martin.st>
| * tls: fix compilation when both gnutls and openssl are enabledJames Almer2015-05-221-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-05-281-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | * 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>
| * | lavf: Use av_codec_get_tag2() in avformat_query_codec().Carl Eugen Hoyos2015-05-281-1/+2
| | | | | | | | | | | | av_codec_get_tag() can return 0 both in case of error and success.
* | | avformat/mxfenc: Support storing signal standard for D10 muxingMichael Niedermayer2015-05-281-0/+11
|/ / | | | | | | | | Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | network: Move variable declaration under an #ifTimothy Gu2015-05-281-1/+1
| | | | | | | | | | | | Avoids an unused variable warning. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: move TLS-related ifdeffery to library specific fileswm42015-05-274-93/+118
| | | | | | | | | | | | There is no need to have this mess in network.c. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: split tls.cwm42015-05-277-374/+545
| | | | | | | | | | | | | | | | Move the OpenSSL and GnuTLS implementations to their own files. Other than the connection code (including options) and some boilerplate, no code is actually shared. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpsubdec: Use double instead of float for timestamp calculationsMichael Niedermayer2015-05-271-3/+3
| | | | | | | | | | | | | | This provides higher precission Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: Ensure the buffer is large enough to avoid seeks from the ↵Michael Niedermayer2015-05-271-0/+2
| | | | | | | | | | | | first frame search Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3: skip junk at the beginning of mp3 fileswm42015-05-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently it can happen that a mp3 file has junk data between id3 tag and actual mp3 data. Skip this to avoid outputting nonsense timestamps. (Two packets had the same timestamps, because the mp3 parser failed to compute a frame duration.) In this case, the junk consisted of 1044 bytes of zero, which incidentally is the same size as normal mp3 frames in this stream. I suspect the mp3 was edited with some tool which wiped the Xing/LAME headers. Data near the end of the file suggests it was encoded with "LAME3.97", but the normal Xing/LAME headers are missing. So this could be "normal". mpg123 also attempts to skip at least 64KB of junk data by scanning for headers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpsubdec: change multipler to int, it only stores 1 and 100Michael Niedermayer2015-05-271-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user sets ↵Michael Niedermayer2015-05-271-4/+9
| | | | | | | | | | | | | | | | | | strict to -1 Fixes Ticket4267 Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: Avoid floats in default duration calculationMichael Niedermayer2015-05-261-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ircamenc: Avoid floatsMichael Niedermayer2015-05-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Avoid floats & float rounding in tmcd nb_frames calculationMichael Niedermayer2015-05-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Avoid float usage in duration calculationMichael Niedermayer2015-05-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Avoid float in bitrate calculationMichael Niedermayer2015-05-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/dnxhd: Autodetect more files that can be decoded.Carl Eugen Hoyos2015-05-261-1/+1
| |
* | mov: reject zero bytes_per_frame with non-zero samples_per_frameAndreas Cadhalpun2015-05-261-0/+7
| | | | | | | | | | | | | | In this case the mov demuxer can return a large number of empty packets. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | lavf/riff: Add 0x729A as TwoCC for G.729.Carl Eugen Hoyos2015-05-251-0/+1
| | | | | | | | Reported by forum user muchuan.
* | avformat/rmenc: Avoid floats in duration calculationMichael Niedermayer2015-05-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: Replace *0.7 by *7/10Michael Niedermayer2015-05-251-1/+1
| | | | | | | | | | | | | | This avoids another float computation, avoiding a potential source of rounding issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: Do not use floats for vcd_padding_bitrateMichael Niedermayer2015-05-251-9/+9
| | | | | | | | | | | | This reduces the risk for rounding differences. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Mark avio context of decompressed atoms as seekableMichael Niedermayer2015-05-251-0/+1
| | | | | | | | | | | | Fixes Ticket4329 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: always check avio_read return valueAndreas Cadhalpun2015-05-241-12/+36
| | | | | | | | | | | | | | | | | | If avio_read fails, the buffer can contain uninitialized data. This fixes 'Conditional jump or move depends on uninitialised value(s)' valgrind warnings. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | mov: fix two memleaksAndreas Cadhalpun2015-05-241-1/+3
| | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | mov: abort on EOF in ff_mov_read_chanAndreas Cadhalpun2015-05-241-0/+5
| | | | | | | | | | | | Otherwise the loop can take a lot of time if num_descr is very large. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/movenc: Remove float use from rgb_to_yuv()Michael Niedermayer2015-05-241-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/swfenc: Remove another unneeded float computationMichael Niedermayer2015-05-241-1/+1
| | | | | | | | | | | | fewer chances for rounding differences between platforms is better Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/swfenc: Remove unneeded floatsMichael Niedermayer2015-05-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avienc: Avoid float usageMichael Niedermayer2015-05-231-1/+1
| | | | | | | | | | | | reduces risk for rounding differences between platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/4xm: Change fps to AVRationalMichael Niedermayer2015-05-231-4/+4
| | | | | | | | | | | | This fixes the video timebase as well Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: fix various memleaks on failureAndreas Cadhalpun2015-05-231-26/+62
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/wavdec: Increase dts packet threshold to fix more misdetectionsRodger Combs2015-05-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavdec: Increase probe_packets limitMichael Niedermayer2015-05-231-1/+1
| | | | | | | | | | | | Fixes DTS detection of b2429e5ba9.dts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: always check the get_str return valueAndreas Cadhalpun2015-05-231-5/+22
| | | | | | | | | | | | | | | | | | | | If it fails, the buffers can be (partially) uninitialized. This fixes 'Conditional jump or move depends on uninitialised value(s)' valgrind warnings. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/nutdec: Check X in 2nd branch of index readingMichael Niedermayer2015-05-231-0/+4
| | | | | | | | | | | | | | Prevents read of uninitialized variable Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfenc: Add color siting elementMichael Niedermayer2015-05-221-1/+14
| | | | | | | | | | | | Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com> Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 16:18:53 +0000