summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc/texi2pod: make references boldTimothy Gu2014-02-061-2/+2
| | | | | | | | | | Inspired by GCC r86635. This is more consistent with other man pages. For example in `man git`, all the "git-help(1)" kind of cross refs are bold. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-061-63/+54
|\ | | | | | | | | | | | | | | | | | | * qatar/master: vp8: Use 2 registers for dst_stride and src_stride in neon bilin filter Conflicts: libavcodec/arm/vp8dsp_neon.S Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp8: Use 2 registers for dst_stride and src_stride in neon bilin filterMartin Storsjö2014-02-061-60/+60
| | | | | | | | | | | | Based on a patch by Ronald S. Bultje. Signed-off-by: Martin Storsjö <martin@martin.st>
* | flac/x86: add ff_flac_lpc_32_sse4()Loren Merritt2014-02-065-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | benchmarked on sandybridge x86_64: 1358232 decicycles in flac_lpc_32_c 1244575 decicycles in flac_lpc_32_sse4, James Almer's patch 650045 decicycles in flac_lpc_32_sse4, this patch I haven't tested the edgecases such as odd block lengths odd block length tested-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libfdk-aacenc: disable hard version requirementsTimothy Gu2014-02-063-3/+10
| | | | | | | | | | | | | | Enable compilation on machines with an old libfdk-aac. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-062-1/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: force the simple idct for xvid custom matrix test Conflicts: tests/fate/xvid.mak tests/ref/fate/xvid-custom-matrix See: ef034cbf185e1938000a117bd16aa6b33046f479 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: force the simple idct for xvid custom matrix testJanne Grunau2014-02-053-21/+45
| | | | | | | | | | | | | | | | The original test without a forced idct is still useful since it tests the switching of the idct algorithm/permutation on x86 with MMX. MMXext or SSE2. Make sure the test runs only if MMX inline asm is available and force -cpuflags to all. Add the required bitexact flag for both tests.
* | Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'Michael Niedermayer2014-02-051-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64': lavu: add missing log.h include in timer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add missing log.h include in timer.hJanne Grunau2014-02-051-0/+2
| |
* | vorbis: extract metadata from the middle of a streamBen Boeckel2014-02-051-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | If a special comment packet shows up in the middle of the stream, we should extract it out into the vorbis stream metadata dictionary. Also, if there is metadata in the packet on the way in, it might linger since we only add data to the dictionary causing stale metadata to be inserted into the stream. Instead, clear it to remove any doubt about what is new and old. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vorbis: append data from tags togetherBen Boeckel2014-02-051-2/+7
| | | | | | | | | | | | | | | | Currently, if there are multiple 'performer' tags, the last one is the only one which appears. Instead, join them with a semicolon. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: allow streams to update metadataBen Boeckel2014-02-052-0/+16
| | | | | | | | | | Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/oggparseopus: Setting seek_preroll in AVCodecContextVignesh Venkatasubramanian2014-02-051-0/+4
| | | | | | | | | | | | | | | | | | Setting seek_preroll value in AVCodecContext for Opus streams embedded in ogg container. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: use real libfdk-aac version instead of API version in help textTimothy Gu2014-02-051-1/+1
| | | | | | | | | | | | | | Also use real name with a '-' instead of '_'. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-02-051-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: flush subtitle codecs as well with null packets ffplay: reorder the filters to ensure that inputs of the custom filters are merged first Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: flush subtitle codecs as well with null packetsMarton Balint2014-02-051-0/+2
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: reorder the filters to ensure that inputs of the custom filters are ↵Marton Balint2014-02-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | merged first For more info see http://ffmpeg.org/pipermail/ffmpeg-user/2013-December/018761.html Signed-off-by: Marton Balint <cus@passwd.hu>
* | | x86/vp9lpf: remove 8 SWAPs in 84/48 transpose.Clément Bœsch2014-02-051-23/+10
| | |
* | | x86/vp9lpf: remove braindead double pxor.Clément Bœsch2014-02-051-5/+5
| | |
* | | x86/vp9lpf: save a few mov in flat8in/hev masks calc.Clément Bœsch2014-02-051-7/+5
| | |
* | | x86/vp9lpf: add ff_vp9_loop_filter_[vh]_44_16_{sse2,ssse3,avx}.Clément Bœsch2014-02-052-27/+105
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-051-350/+458
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpeg: K&R formatting cosmetics Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpeg: K&R formatting cosmeticsVittorio Giovara2014-02-041-345/+456
| | | | | | | | | | | | | | | | | | | | | Also adjust header #include order and some comments. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | | Merge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'Michael Niedermayer2014-02-051-15/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit '9ecb858775483a76c137e8e1ad45a95e318bca61': doxy: Format @code blocks so they render properly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | doxy: Format @code blocks so they render properlyLuca Barbato2014-02-041-15/+15
| | | | | | | | | | | | | | | | | | @code command reports verbatim everything between it and @endcode. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'Michael Niedermayer2014-02-055-19/+52
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931': lavf: improve handling of sparse streams when muxing Conflicts: doc/APIchanges libavformat/avformat.h libavformat/mux.c libavformat/options_table.h libavformat/version.h See: 37ed5df5c5e06a55724fb9eb215da1594b648282 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf: improve handling of sparse streams when muxingLuca Barbato2014-02-045-4/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently ff_interleave_packet_per_dts() waits until it gets a frame for each stream before outputting packets in interleaved order. Sparse streams (i.e. streams with much fewer packets than the other streams, like subtitles or audio with DTX) tend to add up latency and in specific cases end up allocating a large amount of memory. Emit the top packet from the packet_buffer if it has a time delta larger than a specified threshold. Original report of the issue and initial proposed solution by mus.svz@gmail.com. Bug-id: 31 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | Merge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'Michael Niedermayer2014-02-051-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b': lagarith: reallocate rgb_planes when needed Conflicts: libavcodec/lagarith.c See: 9eef41b848939a0a86582afdb45235e41612d9ba Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lagarith: reallocate rgb_planes when neededAnton Khirnov2014-02-041-6/+6
| | | | | | | | | | | | | | | | | | | | | Fixes invalid writes on pixel format changes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | | Merge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'Michael Niedermayer2014-02-051-1/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * commit '2240e2078d53d3cfce8ff1dda64e58fa72038602': truemotion1: check the header size See: e7b43e8e84e48fccf64cdc62430cb8b5c69e804c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | truemotion1: check the header sizeAnton Khirnov2014-02-041-0/+5
| | | | | | | | | | | | | | | | | | | | | Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | | Merge commit '1713eec29add37b654ec6bf262b843d139c1ffc6'Michael Niedermayer2014-02-050-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * commit '1713eec29add37b654ec6bf262b843d139c1ffc6': shorten: pad the internal bitstream buffer See: 89d998f1c1eddac3a1256e28ac00ccfdf4d3edd1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | shorten: pad the internal bitstream bufferAnton Khirnov2014-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | | Merge commit '5430839144c6da0160e8e0cfb0c8db01de432e94'Michael Niedermayer2014-02-051-4/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5430839144c6da0160e8e0cfb0c8db01de432e94': eacmv: clear references on frame dimensions change Conflicts: libavcodec/eacmv.c See: e9d443cf08503f7bd0149576ba9e891322de340d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | eacmv: clear references on frame dimensions changeAnton Khirnov2014-02-041-0/+6
| | | | | | | | | | | | | | | | | | | | | Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | | Merge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'Michael Niedermayer2014-02-051-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6': samplefmt: avoid integer overflow in av_samples_get_buffer_size() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | samplefmt: avoid integer overflow in av_samples_get_buffer_size()Justin Ruggles2014-02-041-0/+2
| | | | | | | | | | | | CC:libav-stable@libav.org
* | | Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'Michael Niedermayer2014-02-050-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c': avcodec: Suppress deprecation warnings from avcodec_alloc_frame() Conflicts: libavcodec/utils.c No change as we dont call this deprecated function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avcodec: Suppress deprecation warnings from avcodec_alloc_frame()Diego Biurrun2014-02-041-0/+2
| | | | | | | | | | | | The function is itself obsolete and slated for removal.
* | | Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'Michael Niedermayer2014-02-052-42/+48
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | * commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27': jvdec: K&R formatting cosmetics Conflicts: libavcodec/jvdec.c libavformat/jvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jvdec: K&R formatting cosmeticsVittorio Giovara2014-02-042-43/+49
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/vc1dec: remove blocks_off use from vc1_pred_b_mv()Michael Niedermayer2014-02-041-8/+8
| | | | | | | | | | | | it should always be 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1dec: vc1_pred_b_mv() is not used for fields, simplify codeMichael Niedermayer2014-02-041-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1f097d168d9cad473dd44010a337c1413a9cd198'Michael Niedermayer2014-02-041-1/+10
|\ \ | |/ | | | | | | | | | | * commit '1f097d168d9cad473dd44010a337c1413a9cd198': h264: reset data partitioning at the beginning of each decode call Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: reset data partitioning at the beginning of each decode callAnton Khirnov2014-02-041-1/+10
| | | | | | | | | | | | | | | | | | Prevents using GetBitContexts with data from previous calls. Fixes access to freed memory. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'Michael Niedermayer2014-02-042-10/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'e46ad30a808744ddf3855567e162292a4eaabac7': vp8: use a fixed-size edge emu buffer Conflicts: libavcodec/vp8.c libavcodec/vp8.h See: face578d56c2d1375e40d5e2a28acc122132bc55 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp8: use a fixed-size edge emu bufferAnton Khirnov2014-02-042-15/+14
| | | | | | | | | | | | The reason is the same as for e588615d938f8581f0d6f3771662d08cadfc00de Based on a patch by Ronald S. Bultje <rsbultje@gmail.com>
* | ffserver: use avformat_alloc_context()Michael Niedermayer2014-02-041-2/+7
| | | | | | | | | | | | Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'Michael Niedermayer2014-02-045-2/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '33c859c142ef3f49b7a6227014ad92a680cf4d74': lavf: ignore attachment streams for interleaving purposes Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: ignore attachment streams for interleaving purposesAnton Khirnov2014-02-045-1/+28
| | | | | | | | Those streams should never get any packets by definition.
OpenPOWER on IntegriCloud