aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1'Michael Niedermayer2014-12-274-5/+22
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1': avcodec: add AVCodecContext.sw_pix_fmt Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add AVCodecContext.sw_pix_fmtRémi Denis-Courmont2014-12-254-5/+22
| | | | | | | | | | | | | | | | This carries the pixel format that would be used if it were not for hardware acceleration. This is equal to AVCodecContext.pix_fmt if hardware acceleration is not in use. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5'Michael Niedermayer2014-12-271-62/+43
|\| | | | | | | | | | | | | | | | | | | * commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5': h264: factor hwaccel pixel formats list Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: factor hwaccel pixel formats listRémi Denis-Courmont2014-12-251-54/+35
| | | | | | | | | | | | | | This is to avoid proliferation of similar tables in following changes. Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avfilter/vf_cropdetect: add yuv440p and yuv410p supportMichael Niedermayer2014-12-271-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_fspp: Add GBRP and gray8 supportMichael Niedermayer2014-12-261-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: check for EOF|error at loop conditionReynaldo H. Verdejo Pinochet2014-12-261-3/+1
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: reflow close_connection()Reynaldo H. Verdejo Pinochet2014-12-261-7/+5
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: minor formatting improvement to http_server()Reynaldo H. Verdejo Pinochet2014-12-261-2/+5
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: reindent start_multicast()Reynaldo H. Verdejo Pinochet2014-12-261-36/+38
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: reflow start_multicast()Reynaldo H. Verdejo Pinochet2014-12-261-6/+9
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: reindent start_children()Reynaldo H. Verdejo Pinochet2014-12-261-29/+27
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: reflow start_children()Reynaldo H. Verdejo Pinochet2014-12-261-17/+23
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: break lines at 80 in func prototypesReynaldo H. Verdejo Pinochet2014-12-261-4/+8
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | x86/vf_fspp: move pxor in store slice functions out of the loopJames Almer2014-12-261-2/+2
| | | | | | | | | | | | | | m7 is not overwritten, so we only need to clear it once. Found by Christophe Gisquet. Signed-off-by: James Almer <jamrial@gmail.com>
* | x86/vf_fspp: port inline asm to yasmJames Almer2014-12-266-1419/+787
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter/vf_fspp: clarify commentMichael Niedermayer2014-12-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: Pass through chroma positions in sws_getCachedContextKieran Kunhya2014-12-261-0/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_boxblur: generate supported pixfmt list instead of hardcodingMichael Niedermayer2014-12-261-14/+12
| | | | | | | | | | | | This adds support for several more >8bit planar formats Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-261-11/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cache: remove ftruncate usage, its not always availableMichael Niedermayer2014-12-261-2/+2
| | | | | | | | | | | | | | | | | | | | In case of errors the cache file will be slightly larger than needed, this should have no practical relevance though Should fix build on VS201* Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/blend: add difference128 modeStefano Sabatini2014-12-263-1/+6
| |
* | avformat/cache: Extend cache entries if possible instead of creating new onesMichael Niedermayer2014-12-261-17/+29
| | | | | | | | | | | | | | This reduces the number of cache entries and should significantly reduce memory requirements Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cache: avoid lseek() on reading from the cache if possibleMichael Niedermayer2014-12-261-2/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cache: keep cache_pos updatedMichael Niedermayer2014-12-261-2/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cache: cleanup cache file on cache write failureMichael Niedermayer2014-12-261-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Changelog: Mention non continuous cache protocolMichael Niedermayer2014-12-261-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/xbr: reindent after previous commitClément Bœsch2014-12-251-85/+85
| |
* | avfilter/xbr: refactor px calculation in FILT[234]Clément Bœsch2014-12-251-9/+15
| |
* | avfilter/xbr: move alpha blend assignment out of the macrosClément Bœsch2014-12-251-38/+38
| |
* | avfilter/xbr: remove unused maskClément Bœsch2014-12-251-1/+0
| |
* | avfilter/xbr: refactor alpha blending macrosClément Bœsch2014-12-251-20/+6
| |
* | avformat/cache: Support user specified read-ahead for non seekable mediaMichael Niedermayer2014-12-251-1/+41
| | | | | | | | | | | | Fixes Ticket2406 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cache: Use the correct io handle in seekingMichael Niedermayer2014-12-251-5/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cache: more informative error messageMichael Niedermayer2014-12-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cache: remember EOF point if hit and use it to handle SEEK_ENDMichael Niedermayer2014-12-251-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cache: support non continuous cachingMichael Niedermayer2014-12-252-30/+138
| | | | | | | | | | | | | | This allows using the cache protocol on top of seekable but slow protocols to speed them up Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/nvenc: Remove special cases for cygwinTimo Rothenpieler2014-12-251-23/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/smoothstreamingenc: Use av_freep() avoid leaving stale pointers in ↵Michael Niedermayer2014-12-251-5/+5
| | | | | | | | | | | | memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wtvdec: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-12-251-10/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-12-251-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_scale: Use correct chroma positions for YUV420PKieran Kunhya2014-12-251-0/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1_mc: use the same reference as luma does in ff_vc1_mc_4mv_chroma()Michael Niedermayer2014-12-251-1/+1
| | | | | | | | | | | | Fixes Ticket3230 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_fspp: add missing inline asm guardsJames Almer2014-12-241-0/+4
| |
* | lavfi/mp: drop mp=fspp filterStefano Sabatini2014-12-245-2129/+1
| | | | | | | | It has been ported to libavfilter.
* | lavfi: port mp=fspp to a native libavfilter filterArwa Arif2014-12-2411-3/+2240
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avfilter/showwaves: fix height range for cline modeClément Bœsch2014-12-241-1/+1
| |
* | avfilter/showwaves: use INT16_MAX instead of a self defined macroClément Bœsch2014-12-241-5/+3
| |
* | avformat/seek: move the cur variable into the loopMichael Niedermayer2014-12-241-2/+1
| | | | | | | | | | | | | | This improves readability and makes it clear that the freed value is not used after the end of an iteration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtpdec_mpeg4: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-241-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>