summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avfilter/showcqt: adding freetype supportMuhammad Faiz2014-06-302-29/+154
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avdevice/xv: fix missing {Michael Niedermayer2014-06-301-1/+1
| | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: convert resample_common/linear_int16_mmx2/sse2 to yasm.Ronald S. Bultje2014-06-304-215/+187
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/xv: handle delete window messageLukasz Marek2014-06-301-0/+16
| | | | | | | | | User may close X11 window by close button on tray. FFmpeg leaves in graceless way. This commit detects it and return EPIPE error. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/pgssubdec: remove unused variablesMichael Niedermayer2014-06-301-3/+0
| | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/pgssubdec: Check input buffer size in parse_presentation_segment()Michael Niedermayer2014-06-301-0/+8
| | | | | | Might fix overread, no testcase known though. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'Michael Niedermayer2014-06-301-120/+239
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772': pgssubdec: handle more complex PGS scenarios Conflicts: libavcodec/pgssubdec.c Some of this has been split out and commited in cleanly split patches immedeately before this merge Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pgssubdec: handle more complex PGS scenariosJohn Stebbins2014-06-301-130/+294
| | | | | | | | | | | | | | | | | | Add ability to handle multiple palettes and objects simultaneously. Each simultaneous object is given its own AVSubtitleRect. Note that there can be up to 64 currently valid objects, but only 2 at any one time can be "presented". Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/pgssubdec: fix end display timeJohn Stebbins2014-06-301-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is setJohn Stebbins2014-06-301-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: better error codesJohn Stebbins2014-06-301-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Pass AVSubtitleRect to decode_rle()John Stebbins2014-06-301-11/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: split out flush_cache()John Stebbins2014-06-301-10/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: do not fail when part of the packet is faulty unless ↵John Stebbins2014-06-301-6/+11
| | | | | | | | | | | | AV_EF_EXPLODE is set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: rename PICTURE_SEGMENTJohn Stebbins2014-06-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: remove trailing ':' at the end of sectionsClément Bœsch2014-06-301-4/+4
| | | | | | | | Also lowercase "options" in "Advanced Video Options" for consistency.
* | avformat/hdsenc: Use av_mallocz_array()Michael Niedermayer2014-06-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: use av_malloc_array()Michael Niedermayer2014-06-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample/resample_template: move division out of loop for float/double ↵Michael Niedermayer2014-06-301-2/+7
| | | | | | | | | | | | swri_resample_linear() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-06-291-0/+1
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: configure: enable lto for icl compiler. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | configure: enable lto for icl compiler.Matthew Oliver2014-06-291-0/+1
| | |
* | | swresample/resample_template: flip order of operations in ↵Michael Niedermayer2014-06-291-1/+4
|/ / | | | | | | | | | | | | | | | | | | swri_resample_linear() for 32bit Fixes integer overflow Found-by: BBB Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: ignore sws_flags if swscale is not enabledMichael Niedermayer2014-06-291-0/+5
| | | | | | | | | | | | This avoids some failures during fate when swscale is disabled Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffyuvencdsp: try to fix misaligned accessMichael Niedermayer2014-06-291-1/+1
| | | | | | | | | | | | Should fix fate on MIPS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples/resampling_audio: use av_freep() for safteyMichael Niedermayer2014-06-291-1/+1
| | | | | | | | | | | | also its better in examples to use the safer functions. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/overlay: reindentClément Bœsch2014-06-291-15/+14
| |
* | avfilter/buffersrc: reindentClément Bœsch2014-06-291-7/+7
| |
* | ffmpeg_opt: route -ab to -b:aMichael Niedermayer2014-06-291-1/+7
| | | | | | | | | | | | | | Fixes combining -ab with -target pal-dvd Fixes Ticket3736 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_pullup: workaround bug in gcc 4.4.3 on ARMMichael Niedermayer2014-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | The gcc version affected is very old and unmaintained AFAIK thus i made no attempt to report this to the gcc developers. The workaround is pushed as it may still affect users and does affect one fate client Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples/muxing: remove unused variableMichael Niedermayer2014-06-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'Michael Niedermayer2014-06-281-1/+3
|\ \ | |/ | | | | | | | | | | * commit '7b0c7c9163fe3dd0081696befde28617119d2590': arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernelMartin Storsjö2014-06-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running on a 64 bit kernel, /proc/cpuinfo lists different optional features than on 32 bit kernels (because some of them are mandatory in the 64 bit implemenations). The kernel does list the old features properly if they are queried via /proc/self/auxv though - however this file is not always readable (e.g. on most android systems). The getauxval function could also provide the same info as /proc/self/auxv even if this file isn't readable, but this function is not always available (and thus would need to be loaded with dlsym for compatibility with older android versions). The android cpufeatures library does this slightly differently, by assuming that these are available if the "CPU architecture" line is >= 8, see [1] for details. It has been suggested to include the old, non-optional features in /proc/cpuinfo as well, but that suggested patch never was merged. See [2] for the discussion around this suggestion. [1] https://android-review.googlesource.com/91380 [2] http://marc.info/?l=linux-arm-kernel&m=139087240101974 Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/options_table: Fix flush_packet flag flagsMichael Niedermayer2014-06-281-1/+1
| | | | | | | | | | Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: fix flush_packets flag with flushing buffersMichael Niedermayer2014-06-281-1/+1
| | | | | | | | | | Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cavs: improve conformance with rm52j reference decoderYao Wang2014-06-282-179/+189
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cavs: make cavs_chroma_qp non staticMichael Niedermayer2014-06-283-9/+10
| | | | | | | | | | | | | | | | The table is needed by multiple files Reverts part of ef07ac1e126b95ad7e1b56504c19b59901265c3e Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: rewrite resample_common/linear_float_sse/avx in yasm.Ronald S. Bultje2014-06-286-149/+481
| | | | | | | | | | | | | | | | | | | | | | Linear interpolation goes from 63 (llvm) or 58 (gcc) to 48 (yasm) cycles/sample on 64bit, or from 66 (llvm/gcc) to 52 (yasm) cycles/ sample on 32bit. Bon-linear goes from 43 (llvm) or 38 (gcc) to 32 (yasm) cycles/sample on 64bit, or from 46 (llvm) or 44 (gcc) to 38 (yasm) cycles/sample on 32bit (all testing on OSX 10.9.2, llvm 5.1 and gcc 4.8/9). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" ↵Michael Niedermayer2014-06-281-3/+3
| | | | | | | | | | | | with nasm Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: move dst_size == 0 handling outside DSP function.Ronald S. Bultje2014-06-281-3/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/APIchanges: lengthening a hash to make it non ambigousMichael Niedermayer2014-06-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | APIchanges: fillin some missing dataMichael Niedermayer2014-06-281-22/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '39975acc699c83af0a87a7318c0f41e189142938'Michael Niedermayer2014-06-281-4/+8
|\ \ | |/ | | | | | | | | | | * commit '39975acc699c83af0a87a7318c0f41e189142938': rtpenc_jpeg: check for color_range too Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_jpeg: check for color_range tooVittorio Giovara2014-06-281-4/+8
| |
* | Merge commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'Michael Niedermayer2014-06-281-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12': apichanges: fill in changes for lavu 51.19 and 51.20 Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * apichanges: fill in changes for lavu 51.19 and 51.20Vittorio Giovara2014-06-281-0/+7
| |
* | avcodec/mpegvideo: dont overwrite emu_edge bufferMichael Niedermayer2014-06-282-2/+3
| | | | | | | | | | | | Fixes vsynth3 fate failures on mips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: reduce space between blocks in emu_edge in ↵Michael Niedermayer2014-06-281-4/+4
| | | | | | | | encode_mb_internal
* | Revert "x86/videodsp: add emulated_edge_mc_mmxext"Michael Niedermayer2014-06-282-74/+29
| | | | | | | | | | | | | | | | | | | | The commit causes minor out of array reads and was mainly intended for future optimizations which turned out not to be meassurably faster. Itself it was just 1 cpu cycle faster Approved-by: jamrial This reverts commit 057d2704e78b52fec357b4fc646c9de37a085413.
* | avcodec/mpeg12dec: Limit progressive_seq reinitilaization to where the ↵Michael Niedermayer2014-06-281-1/+1
| | | | | | | | | | | | | | | | resolution changes Fixes Ticket3743 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vp8: Fix multiple ff_thread_finish_setup() callsMichael Niedermayer2014-06-271-1/+2
| | | | | | | | | | | | Fixes Ticket3725 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud