summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'Michael Niedermayer2014-02-20
|\ | | | | | | | | | | | | * commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4': aarch64: use EXTERN_ASM consistently for exported symbols Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: use EXTERN_ASM consistently for exported symbolsJanne Grunau2014-02-20
| | | | | | | | Based on e3fec3f095ab5ea08ee662942d98526aaf5e3635 for arm.
* | Merge commit '996697e266c8adc0ad9b7fc7568406c7529c97cf'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | * commit '996697e266c8adc0ad9b7fc7568406c7529c97cf': x86: float dsp: unroll SSE versions See: 133b34207c2ca3ae214dfd429288ac6e31efa5dc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: float dsp: unroll SSE versionsChristophe Gisquet2014-02-20
| | | | | | | | | | | | | | | | | | | | vector_fmul and vector_fmac_scalar are guaranteed that they can process in batch of 16 elements, but their SSE versions only does 8 at a time. Therefore, unroll them a bit. 299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | * commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268': dca: replace some memcpy by AV_COPY128 See: 5a48caa34b0c2a2641ea3bd522802fa1df2c8866 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: replace some memcpy by AV_COPY128Christophe Gisquet2014-02-20
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | * commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31': h264: avoid undefined behavior in chroma motion compensation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: avoid undefined behavior in chroma motion compensationJanne Grunau2014-02-20
| | | | | | | | | | | | Makes fate-h264 pass under valgrind --undef-value-errors=yes with -cpuflags none. {avg,put}_h264_chroma_mc8_8 approximately 5% faster, {avg,put}_h264_chroma_mc4_8 2% faster both on x86 and arm.
* | avformat/mov: make invalid sampledelta error more verboseMichael Niedermayer2014-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-02-20
|\ \ | | | | | | | | | | | | | | | | | | * cigaes/master: ffmpeg: make reading packets from thread blocking. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffmpeg: make reading packets from thread blocking.Nicolas George2014-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a packet is not ready on the input selected by ffmpeg, it will read from another input instead. If that happens repeatedly, frames will accumulate somewhere later in the processing to ensure streams synchronization. It can happen in particular when reading from a slow medium or an expensive lavfi filter graph. Make reading from normal demuxers on non-streamed data and from the lavfi pseudo-device blocking to avoid that. Should fix trac ticket #3079.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * qatar/master: mpeg4video_parser: Drop pointless av_-prefix from static function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpeg4video_parser: Drop pointless av_-prefix from static functionDiego Biurrun2014-02-20
| | |
* | | Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | | * commit '984e3398662d460e15904f9e4a6df9ef759070cb': avcodec: Consistently name encoder init functions foo_encode_init Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avcodec: Consistently name encoder init functions foo_encode_initDiego Biurrun2014-02-20
| | |
* | | Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | | * commit '017a06a9ee86b047079166c2694c9c655ff03356': x86: dsputil: Use correct file name as multiple inclusion guard Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | x86: dsputil: Use correct file name as multiple inclusion guardDiego Biurrun2014-02-20
| | |
* | | Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | | * commit 'ba42c852477e87f6e47a5587e8f7829c46c52032': bit_depth_template: Use file name as multiple inclusion guard Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | bit_depth_template: Use file name as multiple inclusion guardDiego Biurrun2014-02-20
| | |
* | | Merge commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | | * commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef': svq3: Adjust #endif comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | svq3: Adjust #endif commentDiego Biurrun2014-02-20
| | |
* | | Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'Michael Niedermayer2014-02-20
|\| | | |/ |/| | | | | | | | | | | | | | | * commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f': build: The MPEG-4 video parser depends on h263dsp Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: The MPEG-4 video parser depends on h263dspDiego Biurrun2014-02-20
| | | | | | | | | | The dependency is indirect through the h263/mpegvideo code. CC: libav-stable@libav.org
* | avcodec/mpeg4videodec: Check for bitstream overread in decode_vol_header()Michael Niedermayer2014-02-20
| | | | | | | | | | | | | | Fixes out of array read Fixes: 08e48e9daae7d8f8ab6dbe3919e797e5-asan_heap-oob_157461c_5295_cov_1266798650_firefing.mpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mux: check av_dup_packet() return value.Nicolas George2014-02-20
| | | | | | | | | | Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-02-20
|\ \ | | | | | | | | | | | | | | | | | | * cigaes/master: lavfi/pan: use extended_data instead of data. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/pan: use extended_data instead of data.Nicolas George2014-02-19
| | | | | | | | | | | | Fix trac ticket #3380.
* | | avfilter/vf_fps: fix rounding error accumulationMichael Niedermayer2014-02-20
| | | | | | | | | | | | | | | | | | | | | Fixes Ticket3329 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libavformat/mpegts: expose raw packet size Conflicts: libavformat/mpegts.c See: f9b997c337873dad99f7fd505588b260febaf32b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | libavformat/mpegts: expose raw packet sizeLeandro Dorileo2014-02-19
| | | | | | | | | | | | | | | | | | | | | | | | We cannot easily determine if an mpeg TS's packet size is DVHS, FEC or so on, for that we need to expose the internal raw_packet_size field. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1': AVOptions: add flags for read/read-only options Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | AVOptions: add flags for read/read-only optionsAnton Khirnov2014-02-19
| | |
* | | Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0': AVOptions: deprecate unused AV_OPT_FLAG_METADATA Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | AVOptions: deprecate unused AV_OPT_FLAG_METADATAAnton Khirnov2014-02-19
| | | | | | | | | | | | | | | It was never used since it was added and the things it was intended for are now exported differently.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-19
|\| | | | | | | | | | | | | | | | | | | | * qatar/master: hevc: Always consider VLC NALU type mismatch fatal Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc: Always consider VLC NALU type mismatch fatalLuca Barbato2014-02-19
| | | | | | | | | | | | | | | | | | Sample-Id: 00001667-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | | Merge commit '175e5063320f585118a5461f15dbacf2ce17e97d'Michael Niedermayer2014-02-19
|\| | | | | | | | | | | | | | | | | | | | * commit '175e5063320f585118a5461f15dbacf2ce17e97d': hevc: Mention the missing SPS in the error message Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc: Mention the missing SPS in the error messageLuca Barbato2014-02-19
| | |
* | | Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'Michael Niedermayer2014-02-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd': doc: Name the MOV muxer as it should be called Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | doc: Name the MOV muxer as it should be calledLuca Barbato2014-02-19
| | | | | | | | | | | | The section name is the muxer, not the format.
* | | Merge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'Michael Niedermayer2014-02-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba': doc: Sort the muxer documentation Conflicts: doc/muxers.texi No change as ours was already sorted Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | doc: Sort the muxer documentationLuca Barbato2014-02-19
| | | | | | | | | | | | Keep the sections alphabetically sorted.
* | | Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0'Michael Niedermayer2014-02-19
|\| | | | | | | | | | | | | | | | | | | | * commit '874c751cc5b99cd68932e21c2c3a0d21134207e0': threads: Check w32threads dependencies at the configure stage Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | threads: Check w32threads dependencies at the configure stageDiego Biurrun2014-02-19
| | | | | | | | | | | | | | | Also add warning comment about threading implementations without matching atomics implementation to the atomics fallback implementation.
* | | avcodec/huffyuv: simplify allocation of temporariesMichael Niedermayer2014-02-19
| | | | | | | | | | | | | | | | | | This also fixes a null pointer dereference with rgb and plane prediction Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Add decklink_enc.h to SKIPHEADERS.Carl Eugen Hoyos2014-02-19
| | | | | | | | | | | | Fixes make checkheaders without decklink headers.
* | | ffmpeg: reduce frame rate for mpeg4 to be within the spec limitsMichael Niedermayer2014-02-19
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/utils: av_guess_frame_rate() favor avg_frame_rate if r_frame_rate ↵Michael Niedermayer2014-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | has a comparably unlikely value Fixes Ticket3399 Fixes Ticket2958 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fix dctdnoiz dependencies, the filter should select dct, not fft.Carl Eugen Hoyos2014-02-19
| | | | | | | | | | | | Fixes compilation with --disable-everything --enable-filter=dctdnoiz
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vf_interlace: deprecate lowpass option Conflicts: libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-19 19:59:55 +0000