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
2014-05-10Add missing changelog entries for v10Reinhard Tartler
2014-05-09rtmpproto: Check the buffer sizes when copying app/playpath stringsMartin Storsjö
As pointed out by Reimar Döffinger. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e) Conflicts: libavformat/rtmpproto.c
2014-05-09swscale: Fix an undefined behaviourLuca Barbato
Prevent a division by zero down the codepath. Sample-Id: 00001721-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 3a177a9cca924e097265b32f9282814f6b653e08)
2014-05-09vp9: Read the frame size as unsignedLuca Barbato
Sample-Id: 00001723-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 925c37874b617816b6f460c6f229c18b46548b46)
2014-05-08dcadec: Use correct channel count in stereo downmix checkTim Walker
s->prim_channels is greater than num_core_channels when an XCh extension is present in the bitstream. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 801c39e1e3058fc4ba822bfb5d8612d777111e32)
2014-05-08dcadec: Do not decode the XCh extension when downmixing to stereoTim Walker
This is neither necessary nor currently supported. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit c8cf461c19e8e35df4b7364d9b90aa42f1ab4560)
2014-05-05Update for 2.2.2n2.2.2Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05lavd/opengl_enc: fix pixel data alignmentLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8ff72924cfeb3c8fa8fc57cfea3f78ca0caaec0f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05ffmpeg: print an error at the end if conversion failedMichael Niedermayer
Fixes Ticket3477 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fed0acebade8d27c428da5cad483cd6a5b64b354) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avfilter/graphdump: Fix pointer to local outside scopeMichael Niedermayer
Fixes CID1194435 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 18af0ce62da322176f7bd283b85314d2f41bee2c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05ffmpeg_filter: fix pointer to local outside scopeMichael Niedermayer
Fixes CID1206652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 09b16619d33ddf93005060d0782f28a1c1cbb7f6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avcodec/mjpegdec: Fix undefined shiftMichael Niedermayer
Fixes CID1194388 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b4329605289e25bb071ec1c1182bf25fc83b09aa) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avformat/h263dec: Fix h263 probeMichael Niedermayer
The code was missing 1 bit in the src format Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fc145e576a443bfc89efdf35b91fd3c9ca0d8388) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avfilter/filtfmts: Support dynamically allocated in/outputsMichael Niedermayer
Fixes crash Fixes Ticket3468 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 59c7615d58b5b7ea9caff2c8c774677973eb4f1c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05iavcodec/vc1dec: Fix missing {}Michael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cb53beb81a5b9192c79de401f1e1e13fadddc429) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avfilter/vf_deshake: fix loss of precission with odd resolutionsMichael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 73734282e0e4df92269984ee1671424e39249481) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avfilter/f_select: fix loss of precission in SAD calculationMichael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5a8ef3c66b762f265b05aa096105555f1d26879c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avcodec/g723_1: add assert to help static code analyzersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1457f3fd90e17745791354fbb87899fc4803085a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avcodec/diracdec: fix undefined behavior with shiftsMichael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b8598f6ce61ccda3f2ff0c730b009fb650e42986) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avformat/mpegts: Remove redundant checkMichael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ff6fa0b4b980fc5b9f7653d7b159ae02c3d95210) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avcodec/fic: Fix return value checkMichael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 230db1426d127a25c03b457fec25900653de2721) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avcodec/dcadec: fix error message suppression codeMichael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f202af29c93f3e9b4103c3c254a8974d7c662315) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avcodec/mjpegen: Fix declared argument sizeMichael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 256f530603ef3838a712a4fcd737b46b7bce455e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05swscale/swscale: fix srcStride/srcSlice typoMichael Niedermayer
Fixes part of Ticket3466 Found by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 14fa7fc6a81d5e59e05243cdc92108eab1b138ac) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avcodec/x86/idct_sse2_xvid: fix non C99 inline functionMichael Niedermayer
Found-by: Matt Oliver <protogonoi@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 46d5625f44185271862337d61cd246fd569c42a4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05avformat/rtmpproto: Added handling of an initial RTMP chunk size packet.Stephan Soller
Fixes ticket #2911. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 36b9c27dae452e10b4fff3d10f836160a5b8fbbd) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2Michael Niedermayer
* commit '79041d92ee7421853ee8c57fc13891cb0c272e0e': matroska: add the Opus mapping Conflicts: libavformat/matroska.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04Merge commit '82cebc0e0544dce507749dd9b1c2983f083de836' into release/2.2Michael Niedermayer
* commit '82cebc0e0544dce507749dd9b1c2983f083de836': matroskadec: read the CodecDelay element Conflicts: libavformat/matroska.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2Michael Niedermayer
* commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a': rtmpproto: Make sure to pass on the error code if read_connect failed Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2Michael Niedermayer
* commit '9d02e38d3f03100784348ff75fd181d2aaad7e43': lavr: allocate the resampling buffer with a positive size Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2Michael Niedermayer
* commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb': mp3enc: Properly write bitrate value in XING header Conflicts: libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04matroska: add the Opus mappingAnton Khirnov
(cherry picked from commit 141fdc763c2841b572d29a2ad78513e8d5325870) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2014-05-03matroskadec: read the CodecDelay elementAnton Khirnov
(cherry picked from commit eb3b5501e8b85bfea09d533314cb6920efc42639) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavformat/matroskadec.c
2014-05-01sws: dont use the optimized 410->420 unscaled conversion when height%4Michael Niedermayer
Fixes Ticket3594 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 421b21ca8a02a346ba03cea3bb2ecc33f791fc30)
2014-05-01avcodec/vorbisdec: try to workaround libvorbisenc bugMichael Niedermayer
Fixes Ticket3590 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0a266cb55af9794fc5cff695d35cae4111e4334f)
2014-04-24swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX inputMichael Niedermayer
Fixes Ticket 3542 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 291d464161a5bf3b566bc147f83e4242b0c18d74)
2014-04-24avformat/mux: Check for and remove invalid packet durationsMichael Niedermayer
Fixes assertion failure Fixes Ticket3575 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dc6a17cf74a90e41d70ea1753cdb70c0a5b2ced8)
2014-04-23avformat/avidec: Speed up keyframe detection codeMichael Niedermayer
Fixes Ticket3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 57fb570908df2e84b11635f12b5be1fb27f053eb)
2014-04-23ffprobe: fix scaling of vali in value_string() in case -prefix is selectedStefano Sabatini
Fix trac ticket #3523. (cherry picked from commit 1ba59b1cbeafe7cd28db04f772abd89eb7e4ce1e)
2014-04-23avformat/asfenc: dont allow non interleaved packetsMichael Niedermayer
The muxer does not support this currently Fixes ticket #3547. Fixes ticket #3555. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 369cdf917aaa5d7fbc61d57f87e638772e806716) (cherry picked from commit 514ec9bece86fed440ac829c10e82c4a0569c3a5)
2014-04-23avformat/pmpdec: remove cur_dts timestamp hackMichael Niedermayer
It appears the demuxer works fine without it Fixes Ticket3534 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5b19fc7aae986d6fa3d689f581b37e4bfba4f2d0)
2014-04-23avformat: Fix decoder search in find stream infoMichael Niedermayer
Fixes Ticket3548 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f3743901d7df906342f99b179382b19d8a4d9716)
2014-04-20rtmpproto: Make sure to pass on the error code if read_connect failedMartin Storsjö
Previously, if read_connect failed, the ret variable was unmodified and had the value 0, indicating success, which then was returned from the rtmp_open function, even though it actually failed. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 6477139721f559b26eafd415e23e13ea2b0c27e1) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2014-04-20lavr: allocate the resampling buffer with a positive sizeAnton Khirnov
This fixes cases where very few input samples (fewer than needed for one output sample) are passed to lavr at the beginning. CC:libav-stable@libav.org (cherry picked from commit ac976ed91e323754e9a84509873ebdb437372797) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2014-04-19ff_id3v2_read: add option to limit ID3 magic number searchPeter Ross
Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 ' chunk tag. If such chunks are stored sequentially, it is possible for the ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g. [1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] [2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5331773cc33ba26b9e26ace643d926219e46a17b) Conflicts: libavformat/dsfdec.c
2014-04-19ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULLPeter Ross
Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c94305ae23318c8956a30485cd5642829f4f16a9)
2014-04-18Do not overwrite VDPAU structures in ff_MPV_frame_start().Carl Eugen Hoyos
Fixes crashes with VDR and MPlayer as reported by irc user crow. (cherry picked from commit 941b2240f2ce59c41f4a9ffec88c512f64c75613)
2014-04-16Fix compilation with --disable-everything --enable-muxer=avi --disable-network.Anh
Fixes ticket #3568. (cherry picked from commit c150e2cf324ce0572bb8b9b3501c45465cfbf360)
2014-04-16avutil/avstring: do not lose ascii characters when decoding non utf-8 with ↵Michael Niedermayer
av_utf8_decode() Fixes Ticket3363 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a31547ce2e5c46d7a7005fe70dcf9b3a7c5fc4ac)
2014-04-16ffprobe: do not lose non ascii characters in non utf8 stringsMichael Niedermayer
Fixes Ticket3363 Using U+FFFD REPLACEMENT CHARACTER as suggested by nicolas Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ca6dd53a734d6fc453de425340d7e9ec4ef385b5)