summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* postproc: simplify forwarding return codesMichael Niedermayer2014-09-18
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libpostproc/postprocess: avoid some if()Michael Niedermayer2014-09-18
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* fate: add fate-filter-pp1Michael Niedermayer2014-09-18
| | | | | | This tests a few more filters with forced quantizers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* x86/me_cmp: combine sad functions into a single macroJames Almer2014-09-17
| | | | | | | | No point in having the sad8 functions separate now that the loop is no longer unrolled. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit '2bb2c2bd75e5f4b28a945511cda77e0a1a44c758'Michael Niedermayer2014-09-18
|\ | | | | | | | | | | | | | | * commit '2bb2c2bd75e5f4b28a945511cda77e0a1a44c758': rtpenc_chain: Pass the initial time_base hint on to the chained muxer See: [FFmpeg-devel] [PATCH] avformat/rtpenc_chain: Set timebase Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_chain: Pass the initial time_base hint on to the chained muxerMartin Storsjö2014-09-17
| | | | | | | | | | | | | | | | | | | | | | | | In practice this hint is ignored - the rtp muxer always overwrites the stream time base without taking the hint into account. But as a general practice this is the correct way to pass a time base hint on to a chained muxer. This avoids warnings about using the codec time base as hint being deprecated. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3f2c70355ab722bc9f741bd3ed8224c7cfb62379'Michael Niedermayer2014-09-18
|\| | | | | | | | | | | | | | | * commit '3f2c70355ab722bc9f741bd3ed8224c7cfb62379': configure: Use the right variables in check_host_cpp See: 453944cc77b9ea27c74011eb7c0e20c887b321cf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Use the right variables in check_host_cppJörg Krause2014-09-17
| | | | | | | | | | | | HOSTCPPFLAGS and HOSTCFLAGS are only set in config.mak. Signed-off-by: Martin Storsjö <martin@martin.st>
* | vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusionAndreas Cadhalpun2014-09-18
| | | | | | | | | | | | | | | | | | The token 'vector' is a keyword in the Vector/SIMD Multimedia Extension data types and thus should not be used as a variable name. This fixes building on powerpc/ppc64el. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/x86: do not expect registers to be preserved across inline ASM blocksVitor Sessak2014-09-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/vp9lpf: Always include x86util.asmMichael Niedermayer2014-09-17
| | | | | | | | | | | | Fixes executable stack Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c5560e72d0bb69f8a1ac9536570398f84388f396'Michael Niedermayer2014-09-17
|\| | | | | | | | | | | | | * commit 'c5560e72d0bb69f8a1ac9536570398f84388f396': apetag: Fix APE tag size check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * apetag: Fix APE tag size checkKaterina Barone-Adesi2014-09-17
| | | | | | | | | | | | | | | | | | | | The size variable is (correctly) unsigned, but is passed to several functions which take signed parameters, such as avio_read, sometimes after having numbers added to it. So ensure that size remains within the bounds that these functions can handle. CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | fate: disable fate-ra4-288, the code uses floats and does not produce the ↵Michael Niedermayer2014-09-17
| | | | | | | | | | | | same results on different platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '44caf99ecae7bc1b907fab849ecaa72dd340ba2e'Michael Niedermayer2014-09-17
|\| | | | | | | | | | | | | | | | | | | * commit '44caf99ecae7bc1b907fab849ecaa72dd340ba2e': fate: Add tests for RealAudio 1.0 (14.4) and RealAudio 2.0 (with 28.8) Conflicts: tests/fate/real.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add tests for RealAudio 1.0 (14.4) and RealAudio 2.0 (with 28.8)Katerina Barone-Adesi2014-09-17
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avfilter: remove obsolete FF_API_FILL_FRAME cruftJames Almer2014-09-17
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'Michael Niedermayer2014-09-17
|\| | | | | | | | | | | | | | | | | | | * commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286': cmdutils: Print a more sensible message in show_filters() w/o libavfilter Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Print a more sensible message in show_filters() w/o libavfilterDiego Biurrun2014-09-16
| | | | | | | | Also avoid an unused variable warning for compilers w/o av_unused support.
* | avcodec/x86/me_cmp: fix sad8xhMichael Niedermayer2014-09-17
| | | | | | | | | | | | | | | | This adds back support for 8x4 and 8x16 it does not support 8x2, i think nothing uses that Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/me_cmp: port mmxext and sse2 sad functions to yasmJames Almer2014-09-17
| | | | | | | | | | | | | | | | | | | | Also add a missing c->pix_abs[0][0] initialization, and sse2 versions of sad16_x2, sad16_y2 and sad16_xy2 (%15 to %20 faster than mmxext). Since the _xy2 versions are not bitexact, they are accordingly marked as approximate. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: remove aconvertPaul B Mahol2014-09-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: remove obsolete FF_API_ACONVERT_FILTER cruftJames Almer2014-09-17
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ffplay: try to fix build failure on appleMichael Niedermayer2014-09-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-09-17
|\ \ | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: use frame queue to determine last used pos ffplay: factorize frame queue operations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: use frame queue to determine last used posMarton Balint2014-09-16
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: factorize frame queue operationsMarton Balint2014-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Create a generic frame and a frame queue struct to handle video picture queues and subtitle picture queues with common code. Also add the possibility to queue AVFrames, however at the moment we only use SDL_Overlay buffers for video and AVSubtitles for subtitles. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | avformat/avienc: Dont search for startcodes in inserted empty avi framesMichael Niedermayer2014-09-17
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | doc/filters: add geq gradient examplesLou Logan2014-09-16
| | | | | | | | | | | | | | | | | | | | | | | | Radial gradient by Víctor Paesa. Linear gradient by Paul Gentemann. Also-by: Víctor Paesa <victorpaesa@googlemail.com> Also-by: Paul Gentemann <beriukay@gmail.com> Signed-off-by: Lou Logan <lou@lrcd.com>
* | | Revert "avformat/rtpproto: fix strict aliasing violations with sockaddr"Michael Niedermayer2014-09-16
|/ / | | | | | | | | | | | | | | | | It appears this breaks build with MSVC until someone who has MSVC setup has time to investigate and workaround/fix this, its better to revert so that build is not broken Thats even more so as the original commit only fixed a hypothetical issue This reverts commit e587a428d75d58e2e5a592efd7bff44e1d9294ee.
* | avfilter/ass: add shaping optionClément Bœsch2014-09-16
| | | | | | | | The documentation is mostly based on ass.h public header.
* | avfilter/ass: better log level mappingClément Bœsch2014-09-16
| |
* | avfilter/ass: make sure the log level are in available rangeClément Bœsch2014-09-16
| |
* | Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'Michael Niedermayer2014-09-16
|\| | | | | | | | | | | | | | | | | | | | | * commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce': dca: K&R formatting cosmetics Conflicts: libavcodec/dca_parser.c libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: K&R formatting cosmeticsGabriel Dume2014-09-16
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '9030c58a780a02fb8256cb75cd39275eaad786d1'Michael Niedermayer2014-09-16
|\| | | | | | | | | | | | | | | * commit '9030c58a780a02fb8256cb75cd39275eaad786d1': configure: Disable i686 for i586 and lower CPUs See: cdb3eee7c496f763d195de34be7f67783b98fb2c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Disable i686 for i586 and lower CPUsMikulas Patocka2014-09-16
| |
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-09-16
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Add a closing LF to Webm-manifest files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Add a closing LF to Webm-manifest files.Carl Eugen Hoyos2014-09-16
| | | | | | | | | | | | | | | | | | Fixes fate-webm-dash-manifest on AIX. Reviewed-by: Nicolas George
* | | tools/crypto_bench: fix build when AV_READ_TIME is unavailableMichael Niedermayer2014-09-16
|/ / | | | | | | | | Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: use av_clip() instead of av_clip_c()Clément Bœsch2014-09-16
| |
* | avformat/flacenc: use av_clip() instead of av_clip_c()Clément Bœsch2014-09-16
| |
* | lavf/hls: add hls_ts_optionSteven Liu2014-09-16
| | | | | | | | | | | | Same as COMMITID 4f5493fe2380ad4aba67759baa7d7d4437f2e776. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | doc/examples/transcoding: use av_packet_rescale_ts()Stefano Sabatini2014-09-16
| | | | | | | | Simplify.
* | Merge commit '2d589273dd36c5eb271a035ea0e669b64dae257f'Michael Niedermayer2014-09-16
|\| | | | | | | | | | | | | * commit '2d589273dd36c5eb271a035ea0e669b64dae257f': configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchainDiego Biurrun2014-09-16
| |
* | avcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroesMichael Niedermayer2014-09-16
| | | | | | | | | | | | reduces noise for tserrors.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: More verbose warning messages in case of missing video ↵Michael Niedermayer2014-09-16
| | | | | | | | | | | | ES startcodes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/network: move sockaddr_union after sockaddr_storage compatibility codeMichael Niedermayer2014-09-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build: simplify libwebp checkClément Bœsch2014-09-15
| | | | | | | | Tested (compilation and runtime) with libwebp 0.2.0, 0.2.1 and 0.4.1.