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
2014-03-06lavd/Makefile: Add fbdev_common.h to SKIPHEADERSJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: vf_shuffleplanes: fix the type of the mapping indices Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'Michael Niedermayer
* commit '3bfdee00cd92ff07c364d4901c4aefda32780756': x86: dcadsp: Fix linking with yasm and optimizations disabled Conflicts: libavcodec/x86/dcadsp_init.c See: 206167a295a5c28cec3c38f7308835b0b7e0618f Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'Michael Niedermayer
* commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f': FATE: add tests for the shuffleplanes filter Conflicts: tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'Michael Niedermayer
* commit '599b81ca9a8e04a27ddad94af462171d16063167': lavfi: add shuffleplanes filter Conflicts: Changelog doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'Michael Niedermayer
* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb': lavfi: use the correct filter context for logging an error. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06vf_shuffleplanes: fix the type of the mapping indicesAnton Khirnov
They are TYPE_INT AVOptions, so they must be ints
2014-03-06Revert "lavu/buffer: add release function"Lukasz Marek
This reverts commit 3144440004941aa22ffea9933f5e5dfe826df654. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer
* lukaszmluki/master: lavd/avdevice: always free detected devices on error lavf/http: return error from seek on invalid whence lavf/http: return error on seeking to negative postion lavf/avio: fix ffurl_alloc error checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06lavd/avdevice: always free detected devices on errorLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-06lavf/http: return error from seek on invalid whenceLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-06lavf/http: return error on seeking to negative postionLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-06lavf/avio: fix ffurl_alloc error checksLukasz Marek
ffurl_alloc doc says it returns >= 0 in case of success. avio treats non-zero as errors. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-06x86: dcadsp: Fix linking with yasm and optimizations disabledDiego Biurrun
Some optimized functions reference optimized symbols, so the functions must be explicitly disabled when those symbols are unavailable.
2014-03-06http: handle ICY in presence of chunked transfer encodingwm4
Some http servers send an ICY stream in combination with chunked transfer encoding. This case was handled incorrectly by the ICY code: instead of handling chunked encoding before anything ICY related, both were mixed. Fix this by separating the ICY code from normal http reading. Move the normal http reading to a new function http_read_stream(), while http_read() handles ICY on top of http_read_stream(). The server identified itself as: cloudflare-nginx Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Fix pthread-related compile errors in iec61883.cAndrey Myznikov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06doc/APIchanges: fill in missing version for "2013-11-14 - 31c09b7 / 728c465 ↵Michael Niedermayer
- lavc 55.26.0 - vdpau.h" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06FATE: add tests for the shuffleplanes filterAnton Khirnov
2014-03-06lavfi: add shuffleplanes filterAnton Khirnov
2014-03-06lavfi: use the correct filter context for logging an error.Anton Khirnov
2014-03-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: arm: hpeldsp: prevent overreads in armv6 asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'Michael Niedermayer
* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d': x86: cabac: Use correct #includes to make header compile standalone Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05avformat/oggparsevorbis: dont use invalid granulesMichael Niedermayer
Fixes Ticket3437 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor ↵Jason Hsu
the output Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05arm: hpeldsp: prevent overreads in armv6 asmJanne Grunau
Based on a patch by Russel King <rmk+libav@arm.linux.org.uk> Bug-Id: 646 CC: libav-stable@libav.org
2014-03-05avcodec/ra144enc: avoid calling emms when the SSE2 version is usedMichael Niedermayer
emms is a rather slow operation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05ra144enc: fix use of scalarprod_int16Christophe Gisquet
c3390fd56cf55259ea7665ecea6c8aeddf56e2fc made use of the DSP function but did not complement it with a call to emms, which is done here before computations involving floats are performed. Fixes ticket #3429, which affected MMX/MMXExt machines. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avfilter: Add missing emms_c when needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05Merge commit '5ddc9f5052316608799b932c604f9e7561f8ce24'Michael Niedermayer
* commit '5ddc9f5052316608799b932c604f9e7561f8ce24': configure: enable PIC on s390(x) Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05x86: cabac: Use correct #includes to make header compile standaloneDiego Biurrun
2014-03-05Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'Michael Niedermayer
* commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c': av_vdpau_get_profile: mask out H.264 intra profile flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05avfilter: Add missing emms_c when neededLuca Barbato
Arch specific calls should have an emms_c following to keep the cpu state consistent. Reported-By: wm4 CC: libav-stable@libav.org
2014-03-05configure: enable PIC on s390(x)Reinhard Tartler
The s390 architecture requires shared libraries to be built in PIC mode. Otherwise applications will get wrong relocations at run-time, leading to confusing segmentation faults. CC: libav-stable@libav.org
2014-03-05mpegts: use goto out instead of break on truncated or invalid pmt tablesMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05x86/synth_filter: add synth_filter_fma3James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05Add "prefer_tcp" flag to "rtsp_flags"Andrey Utkin
If set, and if TCP is available as RTSP RTP transport, then TCP will be tried first as RTP transport. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05av_vdpau_get_profile: mask out H.264 intra profile flagRémi Denis-Courmont
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-03-05x86/synth_filter: add missing HAVE_YASM guardJames Almer
Should fix compilation failures with --disable-yasm on some compilers Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'Michael Niedermayer
* commit '3407172b36a93cec410c6a287dbeec0f41257512': avienc: K&R formatting cosmetics Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'Michael Niedermayer
* commit '4c41a7a1798dd6c60e40f79be12faa98a9347151': vf_frei0r: fix missing end of line character Conflicts: libavfilter/vf_frei0r.c No change as the token parsing change was not merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'Michael Niedermayer
* commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54': doc: fix a couple of typos in frame.h Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04avienc: K&R formatting cosmeticsKeiji Costantini
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-03-04vf_frei0r: fix missing end of line characterVittorio Giovara
Error introduced in 61b323ce7c7cdc101eadfd7de2203922b8a39e8d.
2014-03-04doc: fix a couple of typos in frame.hVittorio Giovara
2014-03-04avformat/mpegtsenc: fix HEVC MPEG TS stream typeolugbone
Allowing HEVC video using TS stream type 0x24 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: put_bits: Remove unused includes Conflicts: libavcodec/put_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'Michael Niedermayer
* commit '5397386effba2e53e4ff82852a86f6be4d59e9c1': mathops: move macro to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'Michael Niedermayer
* commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d': vf_frei0r: refactor library loading from env variable Conflicts: configure libavfilter/vf_frei0r.c Not merged, we use av_strtok() which leads to simpler code Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'Michael Niedermayer
* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e': vf_frei0r: prevent a segfault when filter parameters are not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'Michael Niedermayer
* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9': vf_frei0r: adjust error messages Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 00:26:30 +0300