summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | x86: add detection for FMA3 instruction setJames Almer2014-02-22
| | | | | | | | | | | | | | Based on x264 code Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-22
|\| | | | | | | | | | | | | | | * qatar/master: h264: Fix a typo from the previous commit See: 76dd01ecd4ed51e0669773470ee0d8db2c2e4d3f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Fix a typo from the previous commitLuca Barbato2014-02-22
| | | | | | | | | | | | f777504f640260337974848c7d5d7a3f064bbb45 changed a - in + CC: libav-stable@libav.org
* | avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames ↵Michael Niedermayer2014-02-22
| | | | | | | | | | | | | | | | is too large but the correct one is constant Fixes issue1.m2ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: reset pts_buffer in estimate_timings_from_pts()Michael Niedermayer2014-02-22
| | | | | | | | | | | | This fixes the first few dts after find_stream_info Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()Michael Niedermayer2014-02-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | SDR2 demuxerPaul B Mahol2014-02-22
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Fix FSF address in colormatrix and libzvbi license headers.Carl Eugen Hoyos2014-02-22
| | | | | | | | | | As reported by irc user aca. The files in compat/avisynth are maintained elsewhere, no changes.
* | avcodec/h264_ps: fix printed num_reorder_frames valueMichael Niedermayer2014-02-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: use subsample factors of the used pixel formatMichael Niedermayer2014-02-21
| | | | | | | | | | | | | | Fixes out of array read Fixes: 1cb91c36c4e55463f14aacb9bdf55b38-asan_heap-oob_106cbce_5617_cov_11212800_h264_mmx_chroma_intra_lf.mp4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-21
|\| | | | | | | | | | | | | | | * qatar/master: mxf: Add DNxHD UL See: 2ff540a0fe02c2d2588a7d2aa7820e66a615de95 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add DNxHD ULTomas Härdin2014-02-21
| | | | | | | | | | | | | | Note that the old DNxHD UL is actually JPEG 2000 according to RP224. Leaving it as-is for now. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a9099e04026f300924ac363fa6f8aef912677d90'Michael Niedermayer2014-02-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a9099e04026f300924ac363fa6f8aef912677d90': mxf: Add uncompressed 422 8-bit rawvideo UL Conflicts: libavformat/mxf.c See: 51d632cc8f4c8fa1556d7d8c18c5488700eb6154 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add uncompressed 422 8-bit rawvideo ULPhilip de Nier2014-02-21
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | qcelp: grammarReynaldo H. Verdejo Pinochet2014-02-21
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | qcelpdec: break some too-long linesReynaldo H. Verdejo Pinochet2014-02-21
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-02-21
|\ \ | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Do not warn about missing start time for unknown streams. Only complain about missing frame rate for video streams. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Do not warn about missing start time for unknown streams.Carl Eugen Hoyos2014-02-21
| | |
| * | Only complain about missing frame rate for video streams.Carl Eugen Hoyos2014-02-21
| | |
* | | tests/tiny_ssim: drop isatty() supportMichael Niedermayer2014-02-21
|/ / | | | | | | | | | | | | | | tiny_ssim is build on the host, not the target and the HAVE_* are set for the target. This patch fixes building tiny_ssim when HAVE_* differed between target and host Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-21
|\| | | | | | | | | | | | | | | | | | | * qatar/master: libvorbis: Give consistent names to all functions, structs, and defines Conflicts: libavcodec/libvorbisenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libvorbis: Give consistent names to all functions, structs, and definesDiego Biurrun2014-02-21
| |
* | avformat/movenc: assert that get_cluster_duration() value is validMichael Niedermayer2014-02-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: check that the input timestamps are within the range that ↵Michael Niedermayer2014-02-21
| | | | | | | | | | | | can be stored in mov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: fix sign errorMichael Niedermayer2014-02-21
| | | | | | | | | | | | regression since f777504f640260337974848c7d5d7a3f064bbb45 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix dxva2 & vaapi after removing the +52 offset from the loop ↵Michael Niedermayer2014-02-21
| | | | | | | | | | | | filter parameters Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-21
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: Lower bound check for slice offsets Conflicts: libavcodec/h264.c See: 91253839e14cce9793ee93f184cef609ca8195d5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Lower bound check for slice offsetsVittorio Giovara2014-02-20
| | | | | | | | | | | | | | | | | | | | And use the value from the specification. Sample-Id: 00000451-google Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | * commit '5c79d2e12d13959fc6aed92d102c25194a06de05': avconv: Do not divide by zero Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Do not divide by zeroLuca Barbato2014-02-20
| |
* | Merge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | * commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e': configure: Add usan to the toolchain presets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Add usan to the toolchain presetsLuca Barbato2014-02-20
| | | | | | | | clang-3.4 and gcc-4.9 have it.
* | Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | * commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0': configure: Move cpunop into ARCH_EXT_LIST_X86 Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Move cpunop into ARCH_EXT_LIST_X86Diego Biurrun2014-02-20
| | | | | | | | It is a processor feature, so it belongs there.
* | Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | * commit '6adf4290ebcf65ac8243d74f34ba0a508f561633': configure: Move inet_aton check into network function check block Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Move inet_aton check into network function check blockDiego Biurrun2014-02-20
| |
* | 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>