summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/g2meet: fix src pointer checks in kempf_decode_tile()n2.0.1Michael Niedermayer2013-08-111-1/+3
| | | | | | | | | Fixes Ticket2842 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2960576378d17d71cc8dccc926352ce568b5eec1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* update for 2.0.1Michael Niedermayer2013-08-103-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: add Alexander Strasser for the serverMichael Niedermayer2013-08-101-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c11c180132b3e0038143dc9ba4dfd7287d1509c7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: remove myself from movenc, 2 maintainers should be enoughMichael Niedermayer2013-08-101-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 55a88daf6ff1e09994bff39fac313a38a35b0055) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.cMatthieu Bouron2013-08-101-2/+3
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 88a1ff22336ebfd62b0d1d920e0e7d49f7bd1ece) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: alphabetical sortMichael Niedermayer2013-08-101-9/+9
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 81f4d55c3669733318b2f0e61d10d9efe9b00074) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: Add some maintainers for parts of libavutilMichael Niedermayer2013-08-101-0/+7
| | | | | | | | | | | | Developers added are active and in the copyright of the specified files, If anyone wants to maintain anything else, send a patch that adds you to MAINTAINERS. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b45b1d7af93bd5b8b3824edeae3d1d54644a5361) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: order libavutil entries alphabeticallyMichael Niedermayer2013-08-101-3/+3
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 48188a512068e77fbf94ec1a250870260a1ff1ae) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: drop 1.1 from the releases that i maintainMichael Niedermayer2013-08-101-1/+0
| | | | | | | | | | There seems to be no need to continue maintaining it, people can easily upgrade to 1.2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5fe5f020b6cfb0b7137d12aab10db936cc08836f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: add myself as maintainer for the interface code to swresample & ↵Michael Niedermayer2013-08-101-0/+2
| | | | | | | | | swscale in libavfilter Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5ad4e29337483bbd3337bc47db4ad181d7e2da00) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avisynth: Exit gracefully when trying to serve video from v2.5.8.Stephen Hutchinson2013-08-101-0/+21
| | | | | | | | | | | | 'Fixes' ticket #2526 insofar as it stops 2.5.8 from crashing and tells the user to upgrade to 2.6 if they want to make video input work. A real solution to #2526 would be to get video input from 2.5.8 to work right. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9db353bc4727d2a184778c110cf4ea0b9d1616cb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avisynth: CosmeticsStephen Hutchinson2013-08-101-14/+14
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f277d6bf42329d481f58b6147f6dc4130f198ba5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sgidec: safer check for buffer overflowPaul B Mahol2013-08-101-1/+2
| | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 86e722ab97d7f5f0552c8a0958f7910dfcf3c5b7) Conflicts: libavcodec/sgidec.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ttaenc: fix packet sizePaul B Mahol2013-08-101-1/+1
| | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit bc2187cfdb5eeb82e3caf42a81a00d1ee4c16d8e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* matroskaenc: simplify mkv_check_tag()Michael Niedermayer2013-08-091-3/+2
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 066111bf19518a9f4d836991b34dbfc5ab72a41a)
* lavf/matroskaenc: Check for valid metadata before creating tagsJames Almer2013-08-093-29/+41
| | | | | | | | | | | | Tags must have at least one SimpleTag element to be spec conformant. Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by this. Fixes ticket #2785 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 088ed5314694031e07e02e9d364c9d486a60e704)
* avfilter/vf_separatefields: fix ;;Michael Niedermayer2013-08-091-1/+1
| | | | | | | | Found-by: llogan Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 74561680cd01f36a2b225efb529bcd5729b65d32) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/paf: Fix integer overflow and out of array readMichael Niedermayer2013-08-091-2/+3
| | | | | | | | Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f58cd2867a8af2eed13acdd21d067b48249b14a1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/mem: Fix flipped conditionMichael Niedermayer2013-08-091-1/+1
| | | | | | | | | | Fixes return code and later null pointer dereference Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c94f9e854228e0ea00e1de8769d8d3f7cab84a55) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter: fix plane validity checksMichael Niedermayer2013-08-0911-14/+14
| | | | | | | Fixes out of array accesses (cherry picked from commit e43a0a232dbf6d3c161823c2e07c52e76227a1bc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/kmvc: fix MV checksMichael Niedermayer2013-07-311-4/+4
| | | | | | | | Fixes Ticket2813 Fixes regression since 70b5583 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3cd8aaa2b2e78faf039691e1c31ff4f8d94e3bc6)
* Revert "pnm: remove nonsense code"Paul B Mahol2013-07-291-0/+2
| | | | | | | | | Breaks decoding pgms with 255 < maxval < 65535. Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>. This reverts commit a0348d0966a81a66f3a1bf061576b24d5296b933. (cherry picked from commit 768e40b451a459fefaceed6b1b3d6e70c93596ac)
* jpeg2000dec: Support non subsampled 9-16bit planar pixel formatsMichael Niedermayer2013-07-281-5/+11
| | | | | | | | This applies changes similar to fc6de70c44be05eb0368ab519bfb790431d8dee5 to the >8bit codepath Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1434df3b93fde086be729d174ffbbee1e25792b3)
* jpeg2000dec: silence unused variable warningMichael Niedermayer2013-07-281-1/+1
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit db33010483a024f1343bfb516415fe9ef77e82d9)
* jpeg2000dec: Support non subsampled 8bit planar pixel formatsMichael Niedermayer2013-07-281-5/+12
| | | | | | | Fixes file2.jp2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fc6de70c44be05eb0368ab519bfb790431d8dee5)
* jpeg2000dec: parse CDEFMichael Niedermayer2013-07-281-0/+24
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: libavcodec/jpeg2000dec.c Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 99de97cabf35c035b628943b865ab991583a6ea5)
* Fix pix_fmt detection in the native jpeg2000 decoder.Carl Eugen Hoyos2013-07-281-32/+190
| | | | | | | | Based on b7a928b by Michael Bradshaw. Fixes ticket #2683. Reviewed-by: Nicolas Bertrand (cherry picked from commit b39a6bbe7f43710d8e7163757c5aeef596878712)
* jpeg2000: fix overflow in dequantizationMichael Niedermayer2013-07-283-4/+4
| | | | | | | | | Fixes decoding of file generated with: ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2 Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f57119b8e58cb5437c3ab40d797293ecb9b4a894)
* jpeg2000: Initialize only once mqc arraysNicolas Bertrand2013-07-284-7/+16
| | | | | | | Increases encoding and decoding speed Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dd1382ac9534bd9b5ec7833eed9ab6f383e68a50)
* avformat/dtsdec: Improve probe, reject things looking like analoge signalsMichael Niedermayer2013-07-261-1/+6
| | | | | | | Fixes Ticket2810 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6663205338f57eedb2392263dde48e2717c6e980)
* mpeg12: Ignore slice threading if hwaccel is activeRémi Denis-Courmont2013-07-261-3/+6
| | | | | | | | | | | Slice threading does not work with hardware acceleration, as decoding is per-picture. This fixes Bugzilla #542. Signed-off-by: Diego Biurrun <diego@biurrun.de> (cherry picked from commit 93a51984a27f3ba84d4e6f13d0c704ee9891603e) Conflicts: libavcodec/mpeg12dec.c
* swscale/input: fix 16bit gbrp inputMichael Niedermayer2013-07-191-3/+5
| | | | | | | Fixes Ticket2793 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a4b55bbb6f8ba055bba1493f6872792503e47563)
* ftp: fix interrupt callback misuseLukasz Marek2013-07-181-77/+32
| | | | | | | | | | | | | FTP protocol used interrupt callback to simulate nonblock operation which is a misuse of this callback. This commit make FTP protocol fully blocking and removes invalid usage of interrutp callback Also adds support for multiline responses delimited with dashes (cherry picked from commit 247e658784ead984f96021acb9c95052ba599f26) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/matroskadec: Detect conflicting sample rate/default_durationMichael Niedermayer2013-07-161-1/+10
| | | | | | | | Fixes Ticket2508 Thanks-to: Moritz Bunkus Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6158a3bcdf52fafc1d9ae9eb358a56c614b23aa3)
* mjpegdec: Fix used quant index for gbrMichael Niedermayer2013-07-112-4/+6
| | | | | | | | | Fixes Ticket1651 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 15cee5e5628a80a51d1bb298c8b838ddefd75a88) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mjpegdec: initialize source variables before gbr remapMichael Niedermayer2013-07-111-4/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 94e86ae15a4328b22f6f103b9fd9b6a9ee0c676c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Suggest recompilation with openssl or gnutls if the https protocol is not found.Carl Eugen Hoyos2013-07-111-0/+2
| | | | | | | Fixes ticket #2765. (cherry picked from commit 1db88c33f2c0225aae160cc412b62dfaa3a34cbc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/utils.c: Avoid a null pointer dereference on oom after duration_error ↵Carl Eugen Hoyos2013-07-111-0/+2
| | | | | | | | allocation. (cherry picked from commit c9eb5c9751c88caaed62af5ffe908fe545022e7e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wmavoice: conceal clearly corrupted blocksLuca Barbato2013-07-111-4/+17
| | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind (cherry picked from commit d14a26edb7c4487df581f11e5c6911dc0e623d08) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/qdm2: initialize sign_bitsMichael Niedermayer2013-07-111-1/+1
| | | | | | | | | Fixes non deterministic output Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8f09957194b8d7a3ea909647e22eaf1389b6f5c4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/qdm2: store bits in an integer instead of float variableMichael Niedermayer2013-07-111-1/+2
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fbe159e85079f1f94a7201dc210b155dba7ff4a6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: avformat_find_stream_info set value for ret in case of oomPiotr Bandurski2013-07-111-1/+3
| | | | | | | | | without it FFmpeg didn't display any error message when oom event occured Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b0509563347b81d7b0a2474e56abbc9c99043688) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/aconvert: unbreakPaul B Mahol2013-07-111-14/+21
| | | | | | | | | Even if its deprecated, it should still work correctly. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit bc95b9428950cd672162bcb2bb98fbecad52a5b3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: avformat_find_stream_info fix a crash in case of oomPiotr Bandurski2013-07-111-0/+2
| | | | | | | | | fixes ticket #2767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ccf9211e29bdfad02faf93575bf39a8f89c30647) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/af_earwax: Fix out of array accesses on odd packetsMichael Niedermayer2013-07-101-7/+12
| | | | | | | | Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0a3a0edd52b98aec27d1b8c63c85cb52ff46d40e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Changelog: replace next by 2.0n2.0Michael Niedermayer2013-07-101-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Update for 2.0Michael Niedermayer2013-07-104-3/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* atrac3: fix error handlingLuca Barbato2013-07-101-2/+2
| | | | | | | decode_tonal_components returns a proper AVERROR. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/gif: Do not write GIF89a header if loop is set to -1.Eugene Dzhurinsky2013-07-101-11/+14
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-07-101-6/+11
|\ | | | | | | | | | | | | | | * cus/stable: ffplay: assume 0 stream start time if start time is unset in duration check ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status