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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-21avformat/utils: move side data merge after parserMichael Niedermayer
merging before the parser can conflict with the parser, also future changes depend on it being done later Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21libxavs: rename and fix a variable nameSean McGovern
It was mis-spelled in b18c7c8d3ddfbf171fe0aba1c201a002920af7f7. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-20avcodec/avpacket: fix order of operations in case of too large allocationMichael Niedermayer
Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avcodec/utils: use the unpack_dictionary functionBen Boeckel
Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avcodec/avpacket: use size_t, fix potential integer overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20Document new APIs for av_packet_{un, }pack_dictionary()Ben Boeckel
Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reveiwed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avpacket: add pack/unpack functions for AVDictionaryBen Boeckel
These functions are intended for use with side_data which comes in an AVPacket. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avcodec: add side_data type for updated metadataBen Boeckel
This type is intended to be used to allow codecs to pass updated metadata to applications. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avfilter/showspectrum: use 0 dummies for range in const.Clément Bœsch
This is consistent with other options.
2013-11-20avfilter/showspectrum: reindent const options.Clément Bœsch
2013-11-20avfilter/showspectrum: add blackman window.Clément Bœsch
2013-11-20avfilter/showspectrum: add win_func option.Clément Bœsch
2013-11-20vda_h264_dec: backup context before overridingXidorn Quan
Some of context fields which must be overrided by this wrapper decoder may be set and used by user, so we have to save and restore them before and after invoking the inner decoder to secure user.
2013-11-20fate: test -mbd rd for h261Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avcodec/h261enc: dont use current_mv_x/yMichael Niedermayer
Fixes -mbd rd Fixes Ticket3151 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avcodec/h261enc: avoid use of current/previous_mbaMichael Niedermayer
Fixes part of Ticket3151 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: win{32,64}: Hard disable symbol versioning Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20Merge commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79'Michael Niedermayer
* commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79': ac3dec: simplify an expression Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20ffmpeg: fix do_streamcopy() so it copies side data tooMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avcodec/avpacket: correctly set the number of side data elements in ↵Michael Niedermayer
av_copy_packet_side_data() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20cmdutils: cosmeticsMichael Niedermayer
requested by multiple people Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20doc/muxers/segment: remove wrong default indication for segment_list_flags ↵Stefano Sabatini
option
2013-11-20swscale/x86: SIMD deinterleaveBytes() depends on YASMMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20win{32,64}: Hard disable symbol versioningDerek Buitenhuis
ICL doesn't return an error on unknown parameters, and will always pass the symver_gnu_asm test, and since Windows never has symbol versioning, just always disable it. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-11-20cmdutils: Add -buildconf option.Stephen Hutchinson
The output is formatted to display one option per line. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dv_tablegen: Remove CONFIG_SMALL preprocessor check Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19riff: add DYM4 mpeg4 fourccCompn
2013-11-19ac3dec: simplify an expressionTim Walker
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-19Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'Michael Niedermayer
* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da': avcodec.h: include version.h before using version macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19avfilter/vf_tinterlace: check clone return valueMichael Niedermayer
Inspired by: 3a16ec19d2426457419cb8a7304f97982699efda Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'Michael Niedermayer
* commit '3a16ec19d2426457419cb8a7304f97982699efda': vf_interlace: check one av_frame_clone allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'Michael Niedermayer
* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16': hevc_sei: drop unused parameter Conflicts: libavcodec/hevc_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'Michael Niedermayer
* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e': mpeg4videodec: K&R formatting cosmetics Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'Michael Niedermayer
* commit '8769113accf1f3b78634dec60b37f7354ed6d88d': mpeg4videoenc: K&R formatting cosmetics Conflicts: libavcodec/mpeg4videoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19dv_tablegen: Remove CONFIG_SMALL preprocessor checkDiego Biurrun
The code does in no way depend on CONFIG_SMALL.
2013-11-19swscale/x86/rgb2rgb_template: add mmx/sse2/avx optimized deinterleaveBytesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19swscale/x86/rgb2rgb: change cpu optim identifiers to lower caseMichael Niedermayer
This makes the code more similar to the other optims and allows us to use the same macros to build function names Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19swscale/x86/rgb2rgb: extend framework to also include AVXMichael Niedermayer
This does not yet include any actual AVX code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19swscale: fix used stride in planarToNv12Wrapper()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19swscale: add nv12/nv21->yuv420 converterMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19avcodec.h: include version.h before using version macroVittorio Giovara
2013-11-19vf_interlace: check one av_frame_clone allocationVittorio Giovara
2013-11-19hevc_sei: drop unused parameterVittorio Giovara
2013-11-19mpeg4videodec: K&R formatting cosmeticsVittorio Giovara
2013-11-19mpeg4videoenc: K&R formatting cosmeticsVittorio Giovara
2013-11-19avformat/jacosubdec: make probing less tolerant.Clément Bœsch
Fixes a failure with probetest: ./tools/probetest 8192 500000 [...] Failure of jacosub probing code with score=51 type=1 p=CAB size=16 Random data was: 00000000 40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...
2013-11-19Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: configure: Don't use symlinks for creating the out of tree makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19doc/examples: fix mem issues in filtering_video.Clément Bœsch
2013-11-19configure: Don't use symlinks for creating the out of tree makefileMartin Storsjö
On some platforms (such as msys), symlinks are (poorly) emulated by simply creating a copy of the file. This means that when building out of tree, the build tree gets a copy of the original makefile, which can lead to unintuitive build errors when the original makefile gets updated later. Instead simply create a stub makefile which includes the real one. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-19Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpegvideo: Fix swapping of UV planes for VCR2 See: bae14f38d992f326c94d93f01197ccd84ea62053 Merged-by: Michael Niedermayer <michaelni@gmx.at>