summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/xan: fix style issuePaul B Mahol2014-08-241-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* x86: hevc_mc: split differently callsChristophe Gisquet2014-08-241-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, 2 or 3 calls are performed to functions for unusual widths. Instead, perform 2 calls for different widths to split the workload. The 8+16 and 4+8 widths for respectively 8 and more than 8 bits can't be processed that way without modifications: some calls use unaligned buffers, and having branches to handle this was resulting in no micro-benchmark benefit. For block_w == 12 (around 1% of the pixels of the sequence): Before: 12758 decicycles in epel_uni, 4093 runs, 3 skips 19389 decicycles in qpel_uni, 8187 runs, 5 skips 22699 decicycles in epel_bi, 32743 runs, 25 skips 34736 decicycles in qpel_bi, 32733 runs, 35 skips After: 11929 decicycles in epel_uni, 4096 runs, 0 skips 18131 decicycles in qpel_uni, 8184 runs, 8 skips 20065 decicycles in epel_bi, 32750 runs, 18 skips 31458 decicycles in qpel_bi, 32753 runs, 15 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* x86: hevc_mc: correct unneeded use of SSE4 codeChristophe Gisquet2014-08-241-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* pnmenc: use bits_per_raw_sampleChristophe Gisquet2014-08-241-0/+2
| | | | | | This allows writing actual bitdepth in RGB48 when it isn't actually 16. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Changelog: add "H.261 RTP payload format (RFC 4587)"Michael Niedermayer2014-08-241-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-08-243-3/+10
|\ | | | | | | | | | | | | | | | | * cehoyos/master: fate: Fix ffprobe tests with --target-path set. doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate. Do not print a useless error number if mov header reading fails. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Fix ffprobe tests with --target-path set.Carl Eugen Hoyos2014-08-241-2/+6
| |
| * doc/ffmpeg: Try to clarify that the input option -r is not the same as ↵Carl Eugen Hoyos2014-08-241-0/+3
| | | | | | | | -framerate.
| * Do not print a useless error number if mov header reading fails.Carl Eugen Hoyos2014-08-241-1/+1
| | | | | | | | The error string is printed by ffmpeg as for other demuxers.
* | Add support for H.261 RTP payload format (RFC 4587)ThomasVolkert2014-08-249-0/+279
|/
* avcodec/tiff: Make pixel format checks tighterMichael Niedermayer2014-08-241-2/+6
| | | | | | Fixes assertion failure with imgsrc001-lzma.tiff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc/tiff: add support for LZMA compressionJames Almer2014-08-243-3/+88
| | | | | | | | Derived from deflate code. Requires liblzma. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'Michael Niedermayer2014-08-231-1/+2
|\ | | | | | | | | | | | | | | | | | | * commit '749b1f1359b5af0a08221923b016551b18ab6171': configure: add --enable-rpath Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: add --enable-rpathReinhard Tartler2014-08-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This option facilitates testing shared libarary builds: for instance fate builders do no longer need to set LD_LIBRARY_PATH as the binaries will get the right search paths hardcoded into their executable file. This option is only meant to be used for testing purposes: The installed libraries must not move around in the file system, and doing so will cause a lot of subtle problems. For more information why using RPATH is dangerous, please refer to https://blog.flameeyes.eu/2010/06/the-why-and-how-of-rpath
* | Merge commit '5caf039ba2b4be067568a30146f29008d8db28d0'Michael Niedermayer2014-08-230-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '5caf039ba2b4be067568a30146f29008d8db28d0': Prepare for 11_beta2 Release Conflicts: RELEASE Not merged as theres no FFmpeg 11_beta2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Prepare for 11_beta2 ReleaseReinhard Tartler2014-08-231-1/+1
| |
* | Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'Michael Niedermayer2014-08-231-28/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110': ogg: Use separate classes for the aliases Conflicts: libavformat/oggenc.c See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: Use separate classes for the aliasesLuca Barbato2014-08-231-9/+13
| | | | | | | | Unbreak 051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd
* | avutil/pixelutils: faster pixelutils_sad_16x16Clément Bœsch2014-08-231-5/+11
| | | | | | | | | | | | 501 to 439 decicycles. See 45c7f3997ea11c3d1007b2126b1c0049a8c27105.
* | doc/filters: fix Shwo/Show typoClément Bœsch2014-08-231-1/+1
| |
* | dict.c: Free non-strduped av_dict_set arguments on error.Reimar Döffinger2014-08-234-1/+13
| | | | | | | | | | | | | | | | | | | | Unfortunately this was not explicitly documented and thus might be risky. But all uses I could find in FFmpeg and one in VLC had a memleak in these cases, and I could not find any that relied on the previous behaviour. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avutil/pixelutils: faster pixelutils_sad_[au]_16x16Clément Bœsch2014-08-231-5/+9
| | | | | | | | | | | | | | | | | | | | ~560 → ~500 decicycles This is following the comments from Michael in https://ffmpeg.org/pipermail/ffmpeg-devel/2014-August/160599.html Using 2 registers for accumulator didn't help. On the other hand, some re-ordering between the movs and psadbw allowed going ~538 to ~500.
* | avfilter/showcqt: add fontcolor optionMuhammad Faiz2014-08-233-32/+98
| |
* | avcodec/h264_slice: More complete cleanup in h264_slice_header_init()Michael Niedermayer2014-08-231-5/+11
| | | | | | | | | | | | | | Fixes null pointer dereference Fixes Ticket3873 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc ↵Michael Niedermayer2014-08-231-1/+1
| | | | | | | | | | | | fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/imc: Fix bitstream buffer paddingMichael Niedermayer2014-08-231-1/+1
| | | | | | | | | | | | Fixes buffer overread Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: do not return on sidedata allocation failureChristophe Gisquet2014-08-231-9/+7
| | | | | | | | | | | | | | | | Not having allocated it is not a good reason to leave the object in an undetermined state. Though a particular setting like the AV_EF_* flags could be useful to control that behaviour. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc_ps: fix 1 vs. 0 typoMichael Niedermayer2014-08-221-1/+1
| | | | | | | | | | Found-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vidstabutils: improve documentationTimothy Gu2014-08-221-3/+14
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vidstab*: Remove accidentally exported av_2_vs_pixel_format()Timothy Gu2014-08-224-11/+12
| | | | | | | | | | | | | | | | | | Also correctly namespace other functions in vidstabutils, and decrease difference from Libav. Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'Michael Niedermayer2014-08-221-0/+4
|\ \ | |/ | | | | | | | | | | * commit '3526ab891c28396ada8b58bf7647309bab30de1d': qt-faststart: Undefine fseeko/ftello before defining them Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Undefine fseeko/ftello before defining themDiego Biurrun2014-08-221-0/+4
| | | | | | | | This avoids a number of redefinition warnings on MinGW64.
* | Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'Michael Niedermayer2014-08-220-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6': os_support: Undefine lseek/stat/fstat before defining them Conflicts: libavformat/os_support.h See: ef122ff5072463366c020157f0a27aad7e6610db See: ed3c0fe85dd5c228e98126b18e50ffb617e77070 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * os_support: Undefine lseek/stat/fstat before defining themDiego Biurrun2014-08-221-0/+3
| | | | | | | | This avoids a number of redefinition warnings on MinGW64.
* | Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'Michael Niedermayer2014-08-224-20/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd': ogg: Provide aliases for Speex, Opus and audio-only ogg Conflicts: Changelog libavformat/oggenc.c libavformat/version.h See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: Provide aliases for Speex, Opus and audio-only oggLuca Barbato2014-08-225-2/+60
| | | | | | | | Since they are aliases for ogg enabling any of them enables ogg as well.
* | Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'Michael Niedermayer2014-08-221-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421': electronicarts: set the framerate for TGQ/TQI Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: set the framerate for TGQ/TQIAnton Khirnov2014-08-223-306/+308
| | | | | | | | It is hardcoded to 15fps.
* | Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'Michael Niedermayer2014-08-221-0/+2
|\ \ | |/ | | | | | | | | | | * commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136': electronicarts: read the framerate for MAD Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: read the framerate for MADAnton Khirnov2014-08-222-97/+99
| |
* | wavpackenc: reset trailer info on block encodingChristophe Gisquet2014-08-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | In some cases, in particular if several blocks are needed because of the channel layout (e.g. 2.1), the information used to write the trailing bits terminating the sample data was not reset. This would cause potential desync on the decoder, although decoded samples were actually mostly fine. Fixes ticket #3879.
* | wavpack: check number of channelsChristophe Gisquet2014-08-221-1/+4
| | | | | | | | | | This means container and codec disagree. The codec is supposed to know better so this could be an error instead.
* | Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'Michael Niedermayer2014-08-221-1/+12
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b': electronicarts: do not fail on zero-sized chunks Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: do not fail on zero-sized chunksAnton Khirnov2014-08-221-1/+10
| | | | | | | | | | | | | | At least one FATE sample contains such chunks and happens to work simply by accident (due to find_stream_info() swallowing the error). CC: libav-stable@libav.org
* | Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'Michael Niedermayer2014-08-221-4/+6
|\ \ | |/ | | | | | | | | | | * commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08': rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv34: use ff_mpeg_update_thread_context only when decoder is fully initializedJanne Grunau2014-08-221-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | MpegEncContext based decoders are only fully initialized after the first ff_thread_get_buffer() call. The RV30/40 decoders may fail before a frame buffer was requested. ff_mpeg_update_thread_context() fails on half initialized MpegEncContexts. Since this can only happen before a the first frame was decoded there is no need to call ff_mpeg_update_thread_context(). Based on patches by John Stebbins and tested by John Stebbins. CC: libav-stable@libav.org
* | Merge commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f'Michael Niedermayer2014-08-221-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f': configure: Suppress "potentially uninitialized variable" warnings from MSVC Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Suppress "potentially uninitialized variable" warnings from MSVCDiego Biurrun2014-08-211-1/+1
| | | | | | | | The same is done for GCC and clang already.
* | x86: hevcdsp: use compilation-time-fixed constantChristophe Gisquet2014-08-221-2/+2
| | | | | | | | | | | | | | The stride for some buffers is known. Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevcdsp: remove more instances of compile-time-fixed parametersChristophe Gisquet2014-08-226-69/+64
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status