Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-28avformat/mxfenc: Support storing signal standard for D10 muxingMichael Niedermayer
Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-28network: Move variable declaration under an #ifTimothy Gu
Avoids an unused variable warning. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27lavf: move TLS-related ifdeffery to library specific fileswm4
There is no need to have this mess in network.c. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27lavf: split tls.cwm4
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>
2015-05-27avformat/mpsubdec: Use double instead of float for timestamp calculationsMichael Niedermayer
This provides higher precission Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27avformat/mp3dec: Ensure the buffer is large enough to avoid seeks from the ↵Michael Niedermayer
first frame search Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27avformat/mp3: skip junk at the beginning of mp3 fileswm4
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>
2015-05-27avformat/mpsubdec: change multipler to int, it only stores 1 and 100Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user sets ↵Michael Niedermayer
strict to -1 Fixes Ticket4267 Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26avformat/matroskaenc: Avoid floats in default duration calculationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26avformat/ircamenc: Avoid floatsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26avformat/movenc: Avoid floats & float rounding in tmcd nb_frames calculationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26avformat/asfdec: Avoid float usage in duration calculationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26avformat/mpegts: Avoid float in bitrate calculationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26lavf/dnxhd: Autodetect more files that can be decoded.Carl Eugen Hoyos
2015-05-26mov: reject zero bytes_per_frame with non-zero samples_per_frameAndreas Cadhalpun
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>
2015-05-26lavf/riff: Add 0x729A as TwoCC for G.729.Carl Eugen Hoyos
Reported by forum user muchuan.
2015-05-25avformat/rmenc: Avoid floats in duration calculationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25avformat/mpegenc: Replace *0.7 by *7/10Michael Niedermayer
This avoids another float computation, avoiding a potential source of rounding issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25avformat/mpegenc: Do not use floats for vcd_padding_bitrateMichael Niedermayer
This reduces the risk for rounding differences. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25avformat/mov: Mark avio context of decompressed atoms as seekableMichael Niedermayer
Fixes Ticket4329 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24mov: always check avio_read return valueAndreas Cadhalpun
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>
2015-05-24mov: fix two memleaksAndreas Cadhalpun
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-24mov: abort on EOF in ff_mov_read_chanAndreas Cadhalpun
Otherwise the loop can take a lot of time if num_descr is very large. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-24avformat/movenc: Remove float use from rgb_to_yuv()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24avformat/swfenc: Remove another unneeded float computationMichael Niedermayer
fewer chances for rounding differences between platforms is better Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24avformat/swfenc: Remove unneeded floatsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24avformat/avienc: Avoid float usageMichael Niedermayer
reduces risk for rounding differences between platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23avformat/4xm: Change fps to AVRationalMichael Niedermayer
This fixes the video timebase as well Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23nutdec: fix various memleaks on failureAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-23avformat/wavdec: Increase dts packet threshold to fix more misdetectionsRodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23avformat/wavdec: Increase probe_packets limitMichael Niedermayer
Fixes DTS detection of b2429e5ba9.dts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23nutdec: always check the get_str return valueAndreas Cadhalpun
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>
2015-05-23avformat/nutdec: Check X in 2nd branch of index readingMichael Niedermayer
Prevents read of uninitialized variable Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22avformat/mxfenc: Add color siting elementMichael Niedermayer
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>
2015-05-22libavformat/mux: Add ff_choose_chroma_location()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22tls: fix compilation when both gnutls and openssl are enabledJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-22Merge commit '94599a6de3822b13c94096d764868128f388ba28'Michael Niedermayer
* commit '94599a6de3822b13c94096d764868128f388ba28': tls: Remove all the local polling loops Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'Michael Niedermayer
* commit 'd13b124eaf452b267480074b2e6946538ed03a6e': tls: Remove the nonblocking code Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'Michael Niedermayer
* commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02': tls: Use custom IO to read from the URLContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22WebP muxer: support a packet containing animated WebP.Urvang Joshi
This is the 1st patch in preparation for using WebPAnimEncoder API for encoding and muxing WebP images. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22tls: Remove all the local polling loopsMartin Storsjö
These aren't necessary any longer. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-22tls: Remove the nonblocking codeMartin Storsjö
Since the underlying URLContext read functions are used, they handle interruption, without having to handle it at this level. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-22tls: Use custom IO to read from the URLContextMartin Storsjö
This avoids hijacking the fd, by reading using the normal URLContext functions instead. This allowing reading data that has been buffered in the underlying URLContext. This avoids using the libraries own send functions that can cause SIGPIPE. The fd is still used for polling the lowlevel socket, for waiting for retries. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-21avformat/mov: check result of avio_seekZhang Rui
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21lavf/mov: Use AVCOL_SPC constants when checking color_space.Carl Eugen Hoyos
Suggested-by: Ronald Bultje
2015-05-21lavf/mov: Write colour matrix "6" for color_space bt470bg.Carl Eugen Hoyos
This matches the demuxer's behaviour.
2015-05-21lavf/mkv: Only skip prores header if the packet is large enough.Carl Eugen Hoyos
Fixes a possible endless loop.
2015-05-20nutdec: abort if EOF is reached in decode_info_header/read_sm_dataAndreas Cadhalpun
These loops can take a lot of time if count is very large. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-20nutdec: stop skipping bytes at EOFAndreas Cadhalpun
This can unnecessarily waste a lot of time. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>