Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-08avformat/movenc: check that the video resolution is supportedMichael Niedermayer
Resolutions are stored as 16bit integers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'Michael Niedermayer
* commit '79fce1ec8abd017593c003917fc123f7119a78d6': arm: Avoid using the 'setend' instruction on ARMv7 and newer Conflicts: libavcodec/arm/h264dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'Michael Niedermayer
* commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe': avformat_new_stream: make the AVCodec parameter const Conflicts: libavformat/utils.c See: e12cfd044c2bae4a099a3b9384b148424858d72b Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'Michael Niedermayer
* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b': af_compand: make sure request_frame always outputs at least one frame See: 6b68e2a43b3407522080be50a2a19cff2f9715ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08arm: Avoid using the 'setend' instruction on ARMv7 and newerMartin Storsjö
This instruction is deprecated on ARMv8, and it is serializing on some ARMv7 cores as well [1]. [1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293 CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-08avformat_new_stream: make the AVCodec parameter constRoman Savchenko
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-07-08af_compand: make sure request_frame always outputs at least one frameAndrew Kelley
This fixes a segmentation fault because request_frame in fifo.c assumes that the call to ff_request_frame will populate fifo->root.next. Before, it was possible for request_frame in af_compand to not do this, resulting in a null pointer access. Now, request_frame in af_compand always will return at least one frame or an error, as per the API specifications in avfilter.h for request_frame. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-07-08Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'Michael Niedermayer
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3': dsputil: Split off FDCT bits into their own context Conflicts: configure libavcodec/Makefile libavcodec/asvenc.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/crystalhd: Add #if HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08doc: add doxygen target tagTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08doc: make doxygen program configurableTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08doc: add doxy-wrapper.sh to doc/doxygen/html dependenciesTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08ffserver: add HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08protect unistd.h with #if HAVE_UNISTD_H in code from recent ↵Michael Niedermayer
av_bprint_fd_contents() patches Should fix build failure on MSVC Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08swresample: misc. doxy improvementsTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08doc/Doxyfile: use 5 columns for alphabetical indexMichael Niedermayer
This reverts a hunk from 671005558a295945f5d4cfd1abca6832af479c0b Reduces diff to what we use on the server Suggested-by: Timothy Gu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'Michael Niedermayer
* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d': libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc'Michael Niedermayer
* commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc': smoothstreamingenc: Fix a memory leak on errors See: a53c5d454ee608fd539e5c02ade3f246470d1cb2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/vmdvideo: remove unneeded includeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avformat/segment: simplify localtime* useMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avformat/segment: Support cutting at clocktimeDeti fliegl
Signed-off-by: Deti fliegl <fliegl@baycom.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07dsputil: Split off FDCT bits into their own contextDiego Biurrun
2014-07-07avdevice/lavfi: allow non-mmappable files for graph_fileAndrey Utkin
Use av_bprint_fd_contents() instead of av_file_map() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07avutil/bprint: Add av_bprint_fd_contents()Andrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstreamOmer Osman
For implicit signaling cases (as possible for Spectral Band Replication and Parametric Stereo Tools), the decoder must decode the first frame to correctly identify the stream configuration (as called from avformat_find_stream_info). The mechanism for this is built-in and only requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec struct. Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de> Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-07smoothstreamingenc: Fix a memory leak on errorsMichael Niedermayer
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-07Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'Michael Niedermayer
* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503': vmd: Split audio and video decoder Conflicts: libavcodec/vmdvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07vmd: Split audio and video decoderNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-07avcodec/cljrdec: remove unneeded includeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'Michael Niedermayer
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b': dsputil: Move draw_edges() to mpegvideoencdsp Conflicts: libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'Michael Niedermayer
* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d': dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc.asm libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'Michael Niedermayer
* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94': dsputil: Split off *_8x8basis to a separate context Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07avcodec/mpegvideo_enc: fix b frame strategy 2Michael Niedermayer
Fixes Ticket3757 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07transcoding: fix Doxygen file pathTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07avcodec/mpegvideo: small indent fix in vismv codeClément Bœsch
2014-07-07avcodec: make vismv option as flag typesClément Bœsch
This allows for example -vismv pf+bf+bb instead of -vismv 7.
2014-07-07avcodec/roqvideodec: set JPEG output color rangeEric Lasota
Signed-off-by: Eric Lasota <ejlasota@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'Michael Niedermayer
* commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6': audio_fifo: Split into a separate doxygen module Conflicts: libavutil/audio_fifo.h See: 689e02808d09bd0441ec199cb1a8953ac7c666f6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'Michael Niedermayer
* commit 'd69243d39b773b64614792487cd93f6ceb237b25': samplefmt: Add doxygen categories Conflicts: libavutil/samplefmt.h See: b27555a3a05f8a39c58ac98561411555da3f4a6f Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'Michael Niedermayer
* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192': dsicin: Split audio and video decoder Conflicts: libavcodec/Makefile libavcodec/dsicinvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07dsputil: Move draw_edges() to mpegvideoencdspDiego Biurrun
2014-07-07Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'Michael Niedermayer
* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58': bmv: Split audio and video decoder Conflicts: libavcodec/bmvvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07avcodec/roqvideo: use JPEG color rangeEric Lasota
Signed-off-by: ejlasota <ejlasota@gmail.com> Also update fate test checksums Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoencDiego Biurrun
2014-07-07dsputil: Split off *_8x8basis to a separate contextDiego Biurrun
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 01:51:25 +0300