summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c'Michael Niedermayer2013-01-24
|\ | | | | | | | | | | | | | | * commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c': wmv2: Propagate the wmv2 idct permutation type to the dsputils context rtp: Make sure priv_data is set before reading it Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmv2: Propagate the wmv2 idct permutation type to the dsputils contextMartin Storsjö2013-01-24
| | | | | | | | | | | | | | | | | | | | This fixes encoding where the idct setting originally was set to FF_IDCT_AUTO and dsputil chose a default idct with a non-null permutation - even if the permutation tables were updated, dct_quantize in x86/mpegvideoenc_template.c also checked the value of this type variable. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtp: Make sure priv_data is set before reading itMartin Storsjö2013-01-23
| | | | | | | | | | | | | | This fixes crashes with muxing H263 into RTSP. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | matroskadec: export codec bits_per_coded_samplePaul B Mahol2013-01-24
| | | | | | | | | | | | Fixes -codec copy with TTA from matroska to matroska. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | matroskaenc: fix -codec copy with TTAPaul B Mahol2013-01-24
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | matroskaenc: support TTA muxingPaul B Mahol2013-01-24
| | | | | | | | | | | | TTA in matroska does not store any private data. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | doc/eval: fix/review the section about SI prefixes and usageStefano Sabatini2013-01-24
| | | | | | | | | | | | | | | | | | | | In particular, prefer "prefix" to "postfix" as in the tool manuals, and specify powers of 2 and 10 explicitly. This is based on the commit: commit 2bf794b69820273e2284d69e9b9c98f5b7136add Author: Marcus Stollsteimer <sto.mar@web.de> Date: Mon Nov 19 21:39:20 2012 +0100
* | doc/eval: fix documentation for time() functionStefano Sabatini2013-01-24
| |
* | doc/eval: substitute if/then/else construct with an example making use of ↵Stefano Sabatini2013-01-24
| | | | | | | | | | | | | | boolean expression composition Since the if/then/else construct is now supported natively, showing how to compose such a construct from basic primitives is misleading.
* | lavu/eval: extend if/ifnot functions to accept a third parameterStefano Sabatini2013-01-24
| | | | | | | | Add support to an if/else construct, simplify logic in expressions.
* | lavc/tta: remove nonsense s->avctx indirection, use avctx directlyPaul B Mahol2013-01-24
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/earwax: remove config_input()Paul B Mahol2013-01-24
| | | | | | | | | | | | | | | | This is wrong function to check for input parameters. Function is not needed because query_formats() already sets supported sample rates. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Refuse to mux tta into matroska, the output file is broken.Carl Eugen Hoyos2013-01-24
| |
* | mpeg4videoenc: check w,h to be within the supported range.Michael Niedermayer2013-01-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gifdec: check that the last keyframe exists and has been successfully parsed.Michael Niedermayer2013-01-24
| | | | | | | | | | | | | | Prevents inconsistent state and null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lcldec: Check length before unsigned subtraction.Michael Niedermayer2013-01-24
| | | | | | | | | | | | | | Fix integer overflow and out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpc8: check stream count before accessing stream 1.Michael Niedermayer2013-01-24
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_mss12_decode_init: check dimensionsMichael Niedermayer2013-01-24
| | | | | | | | | | | | | | Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: add codec_tag lists back.Carl Eugen Hoyos2013-01-24
| | | | | | | | | | | | | | | | | | | | This reverts 312645e : "Do not set codec_tag property for matroska muxers." Also adds dummy codec_tag lists with codecs supported in mkv but not in wav / avi. Fixes ticket #2169.
* | Only try to auto-detect LATM in mpegts if the LOAS demuxer was configured.Carl Eugen Hoyos2013-01-24
| | | | | | | | This allows to decode LATM-in-mpegts without the LOAS demuxer.
* | floatdsp: restrict->av_restrictMichael Niedermayer2013-01-24
| | | | | | | | | | | | Fix msvc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sanm: Check decoded_size.Michael Niedermayer2013-01-24
| | | | | | | | | | | | | | This prevents a buffer overflow in rle_decode() Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | eval: add function to access the current "wallclock" time.Michael Niedermayer2013-01-23
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hls: add missing checks for accessing avoption fieldsMichael Niedermayer2013-01-23
| | | | | | | | | | | | Fixes null pointer exception and probably other things Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlpdec: move ch_assign setup code down to after ch layout is set.Michael Niedermayer2013-01-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlp: fix channel order.Michael Niedermayer2013-01-23
| | | | | | | | | | | | This fixes a regression introduced with todays merge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/hls: broker HTTP optionsMicah Galizia2013-01-23
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavf/segment: exit immediately in case of invalid stream specifierStefano Sabatini2013-01-23
| | | | | | | | | | Avoid duplicated confusing error message, and propagate error code from the failing avformat_match_stream_specifier() call.
* | lavf/segment: avoid failure in case -flags +live and -segment_times/frames ↵Stefano Sabatini2013-01-23
| | | | | | | | | | | | | | are specified The conflict does not apply any longer, since the M3U8 segment target duration is re-computed every time a new segment is added to the list.
* | lavf/segment: drop now pointless segment_list_close() functionStefano Sabatini2013-01-23
| |
* | lavf/segment: mark #EXT-X-ENDLIST in M3U8 only at the end of streamStefano Sabatini2013-01-23
| | | | | | | | | | | | Should fix immediate playback termination. In particular, should fix trac ticket #2172.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * qatar/master: rtpenc: fix overflow checking in avc_mp4_find_startcode() rtmp: fix buffer overflows in ff_amf_tag_contents() rtmp: fix multiple broken overflow checks float_dsp: Include config.h for redefining restrict Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: fix overflow checking in avc_mp4_find_startcode()Xi Wang2013-01-23
| | | | | | | | | | | | | | | | | | | | | | | | The check `start + res < start' is broken since pointer overflow is undefined behavior in C. Many compilers such as gcc/clang optimize away this check. Use `res > end - start' instead. Also change `res' to unsigned int to avoid signed left-shift overflow. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: fix buffer overflows in ff_amf_tag_contents()Xi Wang2013-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A negative `size' will bypass FFMIN(). In the subsequent memcpy() call, `size' will be considered as a large positive value, leading to a buffer overflow. Change the type of `size' to unsigned int to avoid buffer overflow, and simplify overflow checks accordingly. Also change a literal buffer size to use sizeof, and limit the amount of data copied in another memcpy call as well. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: fix multiple broken overflow checksXi Wang2013-01-23
| | | | | | | | | | | | | | | | | | | | | | | | Sanity checks like `data + size >= data_end || data + size < data' are broken, because `data + size < data' assumes pointer overflow, which is undefined behavior in C. Many compilers such as gcc/clang optimize such checks away. Use `size < 0 || size >= data_end - data' instead. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * float_dsp: Include config.h for redefining restrictMartin Storsjö2013-01-23
| | | | | | | | | | | | | | | | This makes sure that the restrict keyword is mapped to whatever keyword the compiler prefers/supports. This fixes building on MSVC (and possibly on GCC 2.x as well). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76': dsputil: remove one array dimension from avg_no_rnd_pixels_tab. Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove one array dimension from avg_no_rnd_pixels_tab.Ronald S. Bultje2013-01-22
| |
* | Merge commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e': dsputil: remove 9/10 bits hpel functions. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove 9/10 bits hpel functions.Ronald S. Bultje2013-01-22
| | | | | | | | These are never used.
* | Merge commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7': dsputil: remove some never-assigned function pointers from the struct. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove some never-assigned function pointers from the struct.Ronald S. Bultje2013-01-22
| |
* | Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * commit '32ff6432284f713e9f837ee5b36fc8e9f1902836': dsputil: remove avg_no_rnd_pixels8. Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove avg_no_rnd_pixels8.Ronald S. Bultje2013-01-22
| | | | | | | | This is never used.
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop DCTELEM typedefDiego Biurrun2013-01-22
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | lavfi/swapuv: support all planar yuv pixel formatsPaul B Mahol2013-01-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904': vorbisdsp: convert x86 simd functions from inline asm to yasm. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdsp: convert x86 simd functions from inline asm to yasm.Ronald S. Bultje2013-01-22
| |
* | Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | * commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a': vp3dsp: don't do aligned reads on input. mlp_parser: cosmetics: re-indent. Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 22:31:09 +0000