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
2012-06-07wmv1: check that the input buffer is large enoughMichael Niedermayer
Fixes null ptr deref Fixes Ticket1367 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f23a2418fb0ccc56fdae4dbf83a5994cc917c475) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07rv20: fix lowres out of array readMichael Niedermayer
Fixes Ticket1239 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0766b6e3ec6b7f51af5787421290284050e32a91) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07yopdec: check frame oddness to be within supported limitsMichael Niedermayer
Fixes Ticket1365 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit febc013dc5d6db1535a4f91cf02fa8089038937c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07yopdec: check that palette fits in the packetMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b6fdf8dea7aaf3cb9a979dce91f752c2ce3086a3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-078svx: fix crashMichael Niedermayer
Fixes Ticket1377 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 03ce421c1361e4ce79468de8269ad51ba2ae4c16) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07sgienc: add a limit for maximum supported resolutionPiotr Bandurski
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 59352cc219c4f933c9a83b45043ec4810c2a51ee) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07qdm2: fix incorrect error spamMichael Niedermayer
Fixes Ticket1375 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8a0efa9cc075523b09b4a0585389df865996c214) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07libmp3lame: add missing layout terminatorMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e47e23698b4ba4388c00379e2b2443b2cfd0aa67) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07h264: Fail on DPC its not fully implementedMichael Niedermayer
Fixes part of Ticket1369 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7cb86633622de22c8b6e43c9d608361e5adda740) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07h264: move q0 scan tables into contextMichael Niedermayer
This fixes out of global array reads. The alternative solutions of checking the index or modifying the VLC tables to prevent the index going outside are each about 1-2 cpu cyclces slower per coded 4x4 block. The alternative of padding the global tables directly is more ugly and moving them to the context should benefit cache locality. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b7d14883939e756cbda376c66552be9d843910a0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07mpeg4videodec: Check that cplx_estimation_* fits in the available spaceMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b02cc2ddc610cd84bbee5923a642a8324988b28c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07gifenc: support resolutions up to 65535x65535Piotr Bandurski
Maybe someone can add a check in the second gif encoder (rgb24), because I'm not sure where it should be added. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e03ddbcd919b11a289c2de8a47c83efe7fab32fb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07binkaudio: check number of channelsPaul B Mahol
Fixes #1380. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 824a6975ee066e944b7a20d1e220fd8974fb6174) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07indeo5: check quant_matMichael Niedermayer
prevents out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8aaa00c3012d425ce50efffadb813ad62d1ff3d5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07ffv1: fix reading global header with CRCMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 21fdf1ccf0a17410943454a48764ee2b05d4b1ac) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07h264_cavlc: check prefix before using it.Michael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 39f0a45a1a087e5bbef84fa3366942384ec32155) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07h264: increase scantable sizes to avoid overreadMichael Niedermayer
We could also check the index but this would slow speed critical code down. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 32e60b6bfed709a7d84fd35942baee12a6080595) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07truemotion1: Check index, fix out of array readMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fd4c1c0b70b5a06dd572d7e27799a2f4c3d9b984) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07exr: make message about missing feature more usefulPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit f5af8d5e76a5726cbeba905363293c4ac5750c8d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07iff: check if there is extradataPaul B Mahol
Fixes #1368. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 8f61526978697e51d3b9e61ea84daf13c42717af) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07exr: alpha supportPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit d66b0cd5c55c66964df6225ebbc8eb7cd3cc91ad) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07lavc: clarify experimental codec messageLou Logan
Should be easier for new users to get a working output. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 73f3f6baffa5386552dbe9a94d56f36286bc26f6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28Fix r10k codec for widths that are not multiples of 64.Carl Eugen Hoyos
Fixes ticket #1358 (cherry picked from commit 5cd947d81b3b6dcfbb1f42e800270a4da5dbbcac) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28Mark avui encoder experimental.Carl Eugen Hoyos
Some decoders require the AVID atom that we currently do not write when encoding avui. (cherry picked from commit 77cea13f0521d4c481ab163220017404c1a13f19) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28jvdec: check videosizeMichael Niedermayer
Fixes null ptr dereference fixes Ticket1364 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b4904e804d3b1c56ac4f5d3386b15daae98fca2d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28motionpixels: check extradata sizeMichael Niedermayer
Fixes null ptr derefernce Fixes Ticket1363 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 50122084a6b3be06781a2b3d8ec036f2d67c32e3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28iff_ilbm: fix null ptr derefMichael Niedermayer
Fixes Ticket1362 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 849d4b041351ef8d77c4231cf417f997e79f9ab7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28yop: check for missing extradataMichael Niedermayer
Fixes null ptr deref Fixes Ticket1361 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 77a4c8b959fa9bc6bcaa42b40a0b046cdf3fec38) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28xan: fix out of array readMichael Niedermayer
Fixes ticket1360 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 01900fcc45e99ee4556e0a5d87ff57b2f150dad4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28cdgraphics: Fix out of array writeMichael Niedermayer
Fixes Ticket1359 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1e5c7376c4ed733910845c9a09e272ac7696b1f4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28Test extradata size before reading from extradata when decoding avui.Carl Eugen Hoyos
(cherry picked from commit 83de4f5fc92b1424c7d77f3411572a9a00eff672) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-25Revert "removing lowres support"Michael Niedermayer
There have been multiple user complaints about loosing this feature while its not clear the 3% speedloss claims where real or fabricated. My own testing indicates no statistically significant speed difference both with mpeg2 and mpeg4, and if at all the code with lowres support is a tiny bit faster than without. This reverts commit 92ef4be4ab9fbb7d901b22e0036a4ca90b00a476, reversing changes made to 2e07f42957666df6d7c63a62263b8447e97b1442. Conflicts: cmdutils.c libavcodec/arm/vp8dsp_init_arm.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavutil/arm/Makefile Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtmp: Return a proper error code instead of -1 rtmp: Check malloc calls rtmp: Check ff_rtmp_packet_create calls lavfi: add audio mix filter flvdec: Make sure sample_rate is set to the updated value tqi: Pass errors from the MB decoder Conflicts: Changelog doc/filters.texi libavcodec/eatqi.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-24Fix compilation with --disable-everything.Carl Eugen Hoyos
2012-05-24lavu/pixfmt: move AVPALETTE_SIZE and _COUNT to pixfmt.hStefano Sabatini
Move AVPALETTE_SIZE and AVPALETTE_COUNT definition from libavcodec/avcodec.h to libavutil/pixfmt.h. The definition is more useful in libavutil, where it can be shared for example by libavfilter and libswscale.
2012-05-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2 http: Add support for reading http POST reply headers http: Add http_shutdown() for ending writing of posts tcp: Allow signalling end of reading/writing avio: Add a function for signalling end of reading/writing lavfi: fix comment, audio is supported now. lavfi: fix incorrect comment. lavfi: remove avfilter_null_* from public API on next bump. lavfi: remove avfilter_default_* from public API on next bump. lavfi: deprecate default config_props() callback and refactor avfilter_config_links() avfiltergraph: smarter sample format selection. avconv: rename transcode_audio/video to decode_audio/video. asyncts: reset delta to 0 when it's not used. x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code. dwt: return errors from ff_slice_buffer_init() Conflicts: ffmpeg.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/formats.c libavfilter/version.h libavfilter/vf_blackframe.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_showinfo.c libavfilter/video.c libavfilter/video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-23tqi: Pass errors from the MB decoderMichael Niedermayer
This silences some valgrind warnings. CC: libav-stable@libav.org Fixes second half of http://ffmpeg.org/trac/ffmpeg/ticket/794 Bug found by: Oana Stratulat Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit f85334f58e1286287d0547a49fa9c93b40cbf48f)
2012-05-23xsubdec: print frame size when too smallMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-23Do not leak extradata when encoding avui.Carl Eugen Hoyos
2012-05-23avuienc: Use field_order to determine if a stream is interlaced.Carl Eugen Hoyos
2012-05-23Fix compilation with --disable-everything --enable-demuxer=ogg (--disable-yasm).Carl Eugen Hoyos
2012-05-23Fix compilation with --disable-everything --enable-demuxer=flac ↵Carl Eugen Hoyos
(--disable-yasm).
2012-05-23ffv1: fix decoder state_transition tableMichael Niedermayer
This fixes a regression with ffv1.1 coder=1 decoding Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-23dwt: use av_freep()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dwt: check malloc calls ppc: Drop unused header regs.h af_resample: remove an extra space in the log output Convert vector_fmul range of functions to YASM and add AVX versions lavfi: add an audio split filter lavfi: rename vf_split.c to split.c Conflicts: doc/filters.texi libavcodec/ppc/regs.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/f_split.c libavfilter/split.c libavfilter/version.h libavfilter/vf_split.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-22x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.Justin Ruggles
This is needed for older versions of yasm/nasm that do not support AVX. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-05-22libvorbis: only store version string if bitexact is not set.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-22Add Avid Meridien Uncompressed (AVUI) encoder.Carl Eugen Hoyos
2012-05-22mpeg4videoparser: support using timestamps from codec.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-22avcodec: add parser flag to indicate that codec TS are the only available ↵Michael Niedermayer
and should be used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>