aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* loco: silence warning: decoded may be used uninitialized in this functionMichael Niedermayer2013-02-281-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-289-10/+123
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: Add a fate test for the noproxy pattern matching lavf: Handle the environment variable no_proxy more properly Conflicts: libavformat/Makefile libavformat/internal.h libavformat/tls.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add a fate test for the noproxy pattern matchingMartin Storsjö2013-02-274-1/+58
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Handle the environment variable no_proxy more properlyMartin Storsjö2013-02-275-9/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handling of the environment variable no_proxy, present since one of the initial commits (de6d9b6404), is inconsistent with how many other applications and libraries interpret this variable. Its bare presence does not indicate that the use of proxies should be skipped, but it is some sort of pattern for hosts that does not need using a proxy (e.g. for a local network). As investigated by Rudolf Polzer, different libraries handle this in different ways, some supporting IP address masks, some supporting arbitrary globbing using *, some just checking that the pattern matches the end of the hostname without regard for whether it actually is the right domain or a domain that ends in the same string. This simple logic should be pretty similar to the logic used by lynx and curl. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'Michael Niedermayer2013-02-281-5/+5
|\| | | | | | | | | | | | | | | * commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3': LICENSE: Move (L)GPLv3 explanation block to a more suitable place swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * LICENSE: Move (L)GPLv3 explanation block to a more suitable placeDiego Biurrun2013-02-271-5/+5
| |
| * swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGBDerek Buitenhuis2013-02-271-0/+78
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Improve dump_attachment documentation.Carl Eugen Hoyos2013-02-281-2/+2
| | | | | | | | Fixes ticket #2299
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-02-281-20/+50
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: do not cycle through unavailable show modes ffplay: add option to disable subtitling ffplay: use NAN to signal invalid external clock ffplay: if audio or video clock is invalid return NAN ffplay: allow frame dropping if we redisplay an already displayed frame ffplay: return true for pictq_prev_picture if it was successful ffplay: only quit from audio_decode_frame before decoding when paused ffplay: drop remaining frames in current audio avpacket when seeking ffplay: signal seek event to read thread Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: do not cycle through unavailable show modesMarton Balint2013-02-271-5/+11
| | | | | | | | | | | | | | | | | | Fixes ticket #2200. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: add option to disable subtitlingMarton Balint2013-02-271-1/+3
| | | | | | | | | | | | | | | | | | Fixes ticket #2201. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: use NAN to signal invalid external clockMarton Balint2013-02-271-5/+4
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: if audio or video clock is invalid return NANMarton Balint2013-02-271-4/+16
| | | | | | | | | | | | | | | | | | | | | This helps us not to make bad decision (frame dropping, audio compensation) right after seeking when we do not know yet the recent audio or video clock. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: allow frame dropping if we redisplay an already displayed frameMarton Balint2013-02-271-3/+7
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: return true for pictq_prev_picture if it was successfulMarton Balint2013-02-271-1/+4
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: only quit from audio_decode_frame before decoding when pausedMarton Balint2013-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | This way the audio clock is updated to a proper value even when the video is paused. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: drop remaining frames in current audio avpacket when seekingMarton Balint2013-02-271-0/+3
| | | | | | | | | | | | | | | | | | Fixes ticket #1928. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: signal seek event to read threadMarton Balint2013-02-271-0/+1
| | | | | | | | | | | | | | | | | | Improves seek delay. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | Revert "lavf/utils: add support for special characters encoding in URL"Michael Niedermayer2013-02-281-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4a8fc1d83b1b55e1ac533644168018ebeec0c732. The commit caused null pointer derefernces when using udp:// after i fixed that it caused ffmpeg to get stuck and remapped arguments like ?ttl=255 -> ?ttl%3d255 I dont want to leave this broken thus temporary revert so we all have some time to look at this without half the network protocols being broken in the meantime
* | | build: make iconv build configurable.Clément Bœsch2013-02-283-8/+8
| | |
* | | lavf/utils: add support for special characters encoding in URLSenthilnathan M2013-02-281-0/+47
| | | | | | | | | | | | | | | | | | | | | In particular, fix trac ticket #2031. Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | | lavf/concatdec: define "ffcat" and "ffconcat" extensionsStefano Sabatini2013-02-282-1/+2
|/ /
* | build: fix iconv detection on some systems.Clément Bœsch2013-02-271-1/+1
| | | | | | | | This at least fix the build on CentOS.
* | lavc/libopusenc: report an error if global_quality is set.Nicolas George2013-02-271-0/+7
| |
* | ffmpeg: free last sub when using -fix_sub_duration.Nicolas George2013-02-271-0/+1
| | | | | | | | | | | | | | | | Fix trac ticket #2242. Note: under valid circumstances, when using -fix_sub_duration, the last subtitle is a dummy termination packet, with no allocated memory.
* | Merge remote-tracking branch 'fredjean/master'Michael Niedermayer2013-02-271-0/+2
|\ \ | | | | | | | | | | | | | | | | | | * fredjean/master: Include fix for building ismindex under MinGW Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Include fix for building ismindex under MinGWFrederic Jean2013-02-271-0/+2
| | | | | | | | | | | | | | | Include cmdutils.h so we can build under windows. Based on fix for https://ffmpeg.org/trac/ffmpeg/ticket/256
* | | exr: simplify decompression pathPaul B Mahol2013-02-271-20/+35
|/ / | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | dv: Correctly identify CDVC profileMichael Niedermayer2013-02-271-1/+5
| | | | | | | | | | | | Fixes Ticket2177 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_lut: correct color/comp permutationMichael Niedermayer2013-02-271-3/+3
| | | | | | | | | | | | Fixes Ticket2225 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGBDerek Buitenhuis2013-02-271-0/+78
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-271-5/+0
|\| | | | | | | | | | | | | * qatar/master: x86: dsputil: Drop some unused function #defines Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil: Drop some unused function #definesDiego Biurrun2013-02-261-5/+0
| |
* | Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'Michael Niedermayer2013-02-272-8/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '845cfc92f908791714b8c4c8a49c91b8c64b685e': x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext Conflicts: libavcodec/x86/dsputil_mmx.c Note, the commit message is wrong, there are no mmxext instructions as claimed in the function. The change should do no harm though Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxextDiego Biurrun2013-02-262-8/+1
| | | | | | | | | | | | The external assembly function uses mmxext instructions and should not be masqueraded as an mmx-only function. Instead, use the mmx-only inline assembly function.
* | Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd'Michael Niedermayer2013-02-275-13/+14
|\| | | | | | | | | | | | | * commit '096cc11ec102701a18951b4f0437d609081ca1dd': x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.cDiego Biurrun2013-02-265-13/+14
| |
* | Merge commit '31a23a0dc663bd42bf593275971b4277a479b73d'Michael Niedermayer2013-02-271-12/+4
|\| | | | | | | | | | | | | * commit '31a23a0dc663bd42bf593275971b4277a479b73d': x86: dsputil_mmx: Remove leftover inline assembly fragments Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil_mmx: Remove leftover inline assembly fragmentsMartin Storsjö2013-02-271-12/+4
| | | | | | | | | | | | These became unused in 71155d7b. Signed-off-by: Martin Storsjö <martin@martin.st>
* | oggdec: chained oggs have timestamp discontinuitiesMichael Niedermayer2013-02-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: mbd has a range of 0..2Michael Niedermayer2013-02-271-1/+1
| | | | | | | | | | | | Fixes Ticket2219 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo_enc: fix gray flag with 444 jpegMichael Niedermayer2013-02-271-0/+6
| | | | | | | | | | | | Fixes Ticket2155 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: add -to option to specify stop timeJean First2013-02-273-0/+26
| | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg12: Detect MXF essence stuff at the end of framesMichael Niedermayer2013-02-261-0/+9
| | | | | | | | | | | | | | Fixes some of the issues with segment.mov See: 0226 15:16 Joseph Artsimov (2.1K) [FFmpeg-devel] Two problems with MPEG2 decoder Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale-test: fix 3 pointer type warningsMichael Niedermayer2013-02-261-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this ↵Michael Niedermayer2013-02-261-0/+2
| | | | | | | | | | | | function Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-261-2/+0
|\| | | | | | | | | | | | | * qatar/master: configure: icc: Drop nonsense adding of cpuflags to LDFLAGS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: icc: Drop nonsense adding of cpuflags to LDFLAGSDiego Biurrun2013-02-261-2/+0
| | | | | | | | This fixes many icc warnings when not setting the CPU type.
* | Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer2013-02-26120-120/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary dsputil.h #includesDiego Biurrun2013-02-26121-120/+5
| |