summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'Michael Niedermayer2014-01-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ebfe622bb1ca57cecb932e42926745cba7161913': mpegvideo: drop support for real (non-emulated) edges Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_motion.c libavcodec/wmv2.c If this is slower on a major platform then it should be investigated and potentially reverted. See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143 See: 3969b4b861ce8152e3195e8f8c3437abd273b90a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: drop support for real (non-emulated) edgesAnton Khirnov2014-01-09
| | | | | | | | | | | | | | Several decoders disable those anyway and they are not measurably faster on x86. They might be somewhat faster on other platforms due to missing emu edge SIMD, but the gain is not large enough (and those decoders relevant enough) to justify the added complexity.
* | doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-allTimothy Gu2014-01-09
| | | | | | | | | | | | ffplay and ffprobe are read-only. Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* | examples/muxing: set timestamps in output audio packetStefano Sabatini2014-01-09
| | | | | | | | In particular, fix trac ticket #3231.
* | examples/muxing: use av_frame_free() in place of av_free()Stefano Sabatini2014-01-09
| |
* | examples/muxing: reuse global audio frameStefano Sabatini2014-01-09
| | | | | | | | Simplify logic, avoid multiple unnecessary alloc/free operations.
* | examples/muxing: honour distinction between encoder PTS timebase and stream ↵Stefano Sabatini2014-01-09
| | | | | | | | | | | | | | | | | | | | timebase Fix PTS set on the frame when encoding, which must be specified in the encoder timebase or this will confuse the encoder. When muxing the packet, the PTS/DTS generated by the encoder is then rescaled to the stream timebase.
* | examples/muxing: set sample formats from list of codec supported sample formatsStefano Sabatini2014-01-09
| | | | | | | | | | Avoid the need of tweaking, also show how to get list of supported sample formats.
* | avcodec/msvideo1enc: fix SKIPS_MAXMichael Niedermayer2014-01-09
| | | | | | | | | | | | Fixes Ticket3270 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: avfilter_register() that works in O(1) timeMichael Niedermayer2014-01-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: add rotate example using degreesLou Logan2014-01-09
| |
* | avformat/udp: debug log udp socket sizerogerdpack2014-01-08
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libstagefright: drop dependancy on sizeof(AVFrame)Michael Niedermayer2014-01-08
| | | | | | | | | | | | | | | | untested (noone tested within about a month) and the change is quite trivial so should be ok. While the code before this change is broken. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/kgv1dec: remove unused function and variableMichael Niedermayer2014-01-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: disable ARM code until its build failure with clang/iphone is fixedMichael Niedermayer2014-01-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9/x86: make STORE_2X2 macro local.Ronald S. Bultje2014-01-08
| | | | | | | | | | | | | | | | Prevents this assembler warning: libavcodec/x86/vp9itxfm.asm:1208: warning: (VP9_IDCT32_1D:309) redefining multi-line macro `STORE_2X2' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffyuvenc: Factorize store_huffman_tables() outMichael Niedermayer2014-01-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ffv1enc: choose 1.2 by default for higher resolutions to ensure ↵Michael Niedermayer2014-01-08
| | | | | | | | | | | | | | multi-threaded decodability Reviewed-by: "Peter B." <pb@das-werkstatt.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'rbultje/vp9-simd'Michael Niedermayer2014-01-08
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rbultje/vp9-simd: vp9: make mv bounds 32bit. vp9: reset contextual caches on frame size change with mt enabled. vp9/x86: idct_32x32_add_ssse3 sub-8x8-idct. vp9/x86: idct_32x32_add_ssse3 sub-16x16-idct. vp9/x86: idct_32x32_add_ssse3. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | vp9: make mv bounds 32bit.Ronald S. Bultje2014-01-07
| | | | | | | | | | | | Fixes an assert in file from trac ticket 3188.
| * | vp9: reset contextual caches on frame size change with mt enabled.Ronald S. Bultje2014-01-07
| | | | | | | | | | | | Fixes crash/valgrind errors in trac ticket 3188 and hang in 3274.
| * | vp9/x86: idct_32x32_add_ssse3 sub-8x8-idct.Ronald S. Bultje2014-01-07
| | | | | | | | | | | | | | | | | | Runtime of the full 32x32 idct goes from 2446 to 2441 cycles (intra) or from 1425 to 1306 cycles (inter). Overall runtime is not significantly affected.
| * | vp9/x86: idct_32x32_add_ssse3 sub-16x16-idct.Ronald S. Bultje2014-01-07
| | | | | | | | | | | | | | | | | | Runtime of all IDCTs together goes from 3327 to 2473 cycles (intra, i.e. ~35% faster) or from 2312 to 1448 cycles (inter, i.e. ~60% faster). Total decode time of ped1080p.webm goes from 8.086sec to 7.974sec (1.4% faster).
| * | vp9/x86: idct_32x32_add_ssse3.Ronald S. Bultje2014-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sub-IDCTs will follow later. ped1080.webm goes from 9.295s to 8.191s (13.5% faster). The IDCT itself goes from 4372 (intra) or 4337 (inter) to 403 (intra) or 329 (inter) cycles for the DC-only form, 23755 (intra) or 23723 (inter) to 3497 (intra) or 3607 (inter) cycles for the no-DC form, which averages from 23393 (intra) or 16612 (inter) to 3449 (intra) or 2392 (inter) for all 32x32s together, i.e. about ~7x faster (all tests done on ped1080p.webm).
* | | avisynth: Use av_packet_from_data instead of av_new_packetStephen Hutchinson2014-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the audio changes from 9eac7c4 were merged as they were, this would cause scripts with both video+audio to fail with a lot of audio decoding errors (the video would be fine). Scripts with only one of either video or audio were unaffected. Additionally, the av_packet changes in general caused seeking to break. Using av_packet_from_data allows video+audio scripts to work as expected, without audio decoding errors. It also fixes seeking. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avisynth: More av_new_packet changesAnton Khirnov2014-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are the remaining av_packet-related bits from 9eac7c4 that didn't get merged at that time. Changes authored by Anton Khirnov <anton@khirnov.net>, split out from 9eac7c4 by Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/huffyuvenc: fix -context 1 encodingMichael Niedermayer2014-01-08
| | | | | | | | | | | | | | | | | | Fixes Ticket3281 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | doc/muxers/image2: apply several formatting changesStefano Sabatini2014-01-08
| | |
* | | doc/muxers/image2: document strftime optionRamiro Polla2014-01-08
| | | | | | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | | doc/muxers/matroska: add information to the matroska metadata language entryHelmut K. C. Tessarek2014-01-08
| | |
* | | doc/ffmpeg: remove documentation for removed vlang/slang optionsStefano Sabatini2014-01-08
| | |
* | | doc/muxers/matroska: reformat documentationStefano Sabatini2014-01-08
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-08
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * qatar/master: arm: Add a missing # as prefix for an immediate constant Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | arm: Add a missing # as prefix for an immediate constantMartin Storsjö2014-01-07
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'Michael Niedermayer2014-01-08
|\| | | | | | | | | | | | | | | | | | | | * commit '5dae4872357613a0b51120b54a4c5221e0ec3f69': arm: Allow overriding the alignment set in the function macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | arm: Allow overriding the alignment set in the function macroMartin Storsjö2014-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function macro always sets .align 2 before declaring the function label (since 5c5e1ea3) and always sets the section to .text (since 278caa6a). The .align 5 before certain functions, added in fc252eba, were added before .text and .align were added to the function macro and thus became useless/unused when the function macro got them. This restores the original intention, to align the loop entry points. Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'Michael Niedermayer2014-01-08
|\| | | | | | | | | | | | | | | | | | | | * commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0': arm: Remove a leftover define for the pld instruction Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | arm: Remove a leftover define for the pld instructionMartin Storsjö2014-01-07
| | | | | | | | | | | | | | | | | | | | | This file no longer uses the pld instruction at all, all such uses have been split into hpeldsp_arm.S. Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'Michael Niedermayer2014-01-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f': arm: cosmetics: Reindent the h264dsp neon init function Conflicts: libavcodec/arm/h264dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | arm: cosmetics: Reindent the h264dsp neon init functionMartin Storsjö2014-01-07
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | | avformat/mxfdec: detect loops during header parsingMichael Niedermayer2014-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header parser uses forward and backward parsing, making the bulletproof prevention of loops difficult, thus this simple detection code. If someone improves the forward/backward parsing so it cannot loop then this commit should be reverted Fixes Ticket3278 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Use the h264 parser when decoding VSSH in avi.Carl Eugen Hoyos2014-01-07
| | | | | | | | | | | | | | | | | | Fixes ticket #3261 visually. Analyzed-by: Michael Doilnitsyn
* | | doc/filters/equalizer: add examples for equalizerWerner Robitza2014-01-07
| | | | | | | | | | | | Add two examples on the usage of the equalizer filter.
* | | tools/qt-faststart: add -movflags +faststart noteLou Logan2014-01-07
| | |
* | | avformat/takdec: zero padding area before useMichael Niedermayer2014-01-07
| | | | | | | | | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fcecee73d71_6470_luckynight-partial.tak Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/adxdec: dont return random data on EOFMichael Niedermayer2014-01-07
| | | | | | | | | | | | | | | | | | | | | Fixes use of uninitialized memory Partly fixes; msan_uninit-mem_7fb7d24780d0_2744_R03T.CAK Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/segafilm: drop song and dance, this seems not to do anything ↵Michael Niedermayer2014-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | anymore since a long time Fixes use of uninitialized memory Partly fixes; msan_uninit-mem_7fb7d24780d0_2744_R03T.CAK Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/flacdec: check rice_order against blocksizeMichael Niedermayer2014-01-07
| | | | | | | | | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f6e13c220d0_8489_short.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-07
|\| | | | | | | | | | | | | | | | | | | | * qatar/master: network.h: Add #endif comments to improve readability Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | network.h: Add #endif comments to improve readabilityDiego Biurrun2014-01-06
| | |