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-06-03Update for 2.2.3n2.2.3Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avformat/h263dec/h263_probe: Check TRMichael Niedermayer
Fixes missdetection of Misdetection_345.mp3 Fixes missdetection of Misdetection_421.mp3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cd20b93e2f5171054d6b3dd9daee1e832c1f9090) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avformat/h263dec/h263_probe: Check PSC bit 9 and 13 inMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3ad21c50af042ab17bedf755ff8245392425c259) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avformat/h263dec: shift data in state to make more bits available to probeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 04b15a6055fc230a655091ce21303f9d2a996ed9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/svq3: Fix "incompatible pointer type" warningsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 89d2fc62db985263fdbfb1f44b23e98d24d77c9e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avformat/utils: Call ff_rfps_add_frame() only for videoMichael Niedermayer
This avoids some unneeded computations Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6f6edfe1c0ede584ea4edf5bb0fc9b961f299631) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avformat/flvenc: fix assertion failure after 4h muxingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2e532aa82d2b938a3cd913a363a79bf92ddf1a33) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/mss4: Fix () in MKVAL() macroMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cf7ff0146c76b93c32edf5230a28b9590acf5105) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/mss34dsp: fix () in SOP* macrosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6e720c5c815e510188a0bda654662383f2c48050) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/mlpdec: fix () in MSB_MASK() macroMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fa160af08b6f42f17e93124aef86e3f6eec70d51) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/ivi_dsp: add some missing () to macrosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f276bf303cbb7a8fed3c388135007bc29f45f8d5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/hevc: fix () in macrosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 70f671c39e53f0e54914185dd3ed5afa6b66708b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/h264: fix () in macrosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit af62b42736c00332d39965168b5cc966a06f07d6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/golomb-test: fix () in EXTEND() macroMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 97e6b5ee3a16fee7d130f19f4dcee030f14d91cf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macroMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fa915d4193e13187773c500b80c7df6baeb22c3b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUEMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 19e66c7232d96e4ae8f05b52da2b84dfaa4e4da3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avutil/cpu: force mmx on selection of higher x86 SIMD featuresMichael Niedermayer
Fixes various runtime failures with manually set flags that represent no existing CPU Fixes Ticket3653 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6310eb8010b7a3b3016e297132380cbd4e3d2d10) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03avcodec/diracdec: move mc buffer allocation to per frameMichael Niedermayer
Fixes out of array accesses for non default buffers with large strides Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4a30f08505a4e85718896ff233c97be41a9754ca)
2014-06-03Merge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2Michael Niedermayer
* commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01': ppc: Fix compilation for ppc64le (ELFv2) aarch64: Use the correct syntax for relocations Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31avformat/mov: allow seeking back to the begin even if nothing is marked as ↵Michael Niedermayer
keyframe Fixes Ticket 3663 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 96470ca22b3b46677de0e2df64e87c5ec80d752b)
2014-05-31Fix spelling error 'Inconsistant -> Inconsistent'Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit eeb3baf7f7257ea5586bf857cc668f6aff81d556)
2014-05-31Fix spelling errors in texi files: accomodate -> accommodate allows to -> ↵Andreas Cadhalpun
allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9898bd9a82ad16f7ef2dcc26542827ff92255821)
2014-05-31Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth ↵Andreas Cadhalpun
Floor, Boston, MA 02110-1301 USA' Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 64b6164b721c77cbb28b381af31bd8ea753818c5)
2014-05-31Improve the detection of architecture x86.Andreas Cadhalpun
This fixes building on Debian GNU/Hurd. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0f17bc644c4af0f9e0fab714fadf4f4f02140a0e)
2014-05-30ppc: Fix compilation for ppc64le (ELFv2)Thierry Fauck
CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit d6d767d93e532246cacf3567e6bcad76a821f838) Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-29aarch64: Use the correct syntax for relocationsMartin Storsjö
This fixes building in PIC mode with gas. The examples in the gas manual showed using a # here even though gas itself actually didn't support that syntax (and the gas test suite only tests it without the extra hash sign). CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 08cd92144e73195eecc28ed0348e66e255516b82) Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-22ffprobe: fix crash happening because of new streams occuringAnshul
Fix trac ticket #3603. Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 73a60633143b7c51333a0772b45a47282ac445b6)
2014-05-13Use Matroska document version 2 for WebM files if possible.Carl Eugen Hoyos
Google's plugin for the Internet Explorer refuses to play files with another document version. Fixes ticket #3583. (cherry picked from commit ab21acecc72a0299895583cf83347ab5e2444b71)
2014-05-11avformat/avidec: remove unused variablesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cc8b45c0ce35465fd0efee7103e41bcc28251f99) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2Michael Niedermayer
* commit 'e780c3daafe0588e035e752c771ebfcd2201746a': pcm-dvd: Fix 20bit decoding Conflicts: Changelog See: 5db49fc38d9132e134de92584f296559bec3b789 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2Michael Niedermayer
* commit '7f954ca502a16feeca44d4e9a7d450b404dabc94': avi: Improve non-interleaved detection Conflicts: Changelog libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()Michael Niedermayer
Fixes Ticket3421 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5d75730c58f72918a41bb5abda4b448ecdd4273c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2Michael Niedermayer
* commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168': Update Changelog Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73' into release/2.2Michael Niedermayer
* commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73': arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d' into release/2.2Michael Niedermayer
* commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d': arm: hpeldsp: prevent overreads in armv6 asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2Michael Niedermayer
* commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3': avfilter: Add missing emms_c when needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2Michael Niedermayer
* commit 'e2a83d72da866a29f5307a56f66c469966f02473': Update Changelog for v10.1 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2Michael Niedermayer
* commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5': Add missing changelog entries for v10 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a' into release/2.2Michael Niedermayer
* commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a': rtmpproto: Check the buffer sizes when copying app/playpath strings Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2Michael Niedermayer
* commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092': swscale: Fix an undefined behaviour Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2Michael Niedermayer
* commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8': vp9: Read the frame size as unsigned Conflicts: libavcodec/vp9.c See: c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2Michael Niedermayer
* commit '194d12345d86c15b20b7e44a3679c9df3075d7f6': dcadec: Use correct channel count in stereo downmix check Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2Michael Niedermayer
* commit 'b3d8276d2dc913d708d187fb15f6e98869d00500': dcadec: Do not decode the XCh extension when downmixing to stereo Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10pcm-dvd: Fix 20bit decodingnu774
Increment the pointer as needed. Bug-Id: 592 Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 9880a0d4b131ef36694d62f78060350a81f08b80) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2014-05-10avi: Improve non-interleaved detectionMichael Niedermayer
Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>. Check the index for streams with a time drift of 2s or a buffer drift of 64MB. Bug-Id: 666 CC: libav-stable@libav.org Sample-Id: yet-another-broken-interleaved-avi.avi Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de> (cherry picked from commit 9d599e3f6e61438772d8cddd6c9b7c495251f51e) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2014-05-10Update ChangelogJohn Stebbins
2014-05-10arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6Janne Grunau
The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41 broke the computation for the last row since it prevented the safe reading from the height+1-th row. CC: libav-stable@libav.org (cherry picked from commit 61985ad72c47bbb668f2d3923bf5c9df83e79323)
2014-05-10arm: hpeldsp: prevent overreads in armv6 asmJanne Grunau
Based on a patch by Russel King <rmk+libav@arm.linux.org.uk> Bug-Id: 646 CC: libav-stable@libav.org (cherry picked from commit cbddee1cca0ebd01e8c5aa694d31228eb4de4b41)
2014-05-10avfilter: Add missing emms_c when neededLuca Barbato
Arch specific calls should have an emms_c following to keep the cpu state consistent. Reported-By: wm4 CC: libav-stable@libav.org (cherry picked from commit e995cf1bccc6e91bbaa6a8771e23fb3ab259c110)
2014-05-10Update Changelog for v10.1Reinhard Tartler