Michael Niedermayer
ddb9a24a7f
Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058'
...
* commit '6c99c92a42add7f6a462114d5a4a53c93c551058':
libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flag
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-27 12:52:59 +01:00
Michael Niedermayer
d16079abf4
Merge commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1'
...
* commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1':
avcodec: add AVCodecContext.sw_pix_fmt
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-27 12:41:10 +01:00
Michael Niedermayer
57089084ba
Merge commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5'
...
* commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5':
h264: factor hwaccel pixel formats list
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-27 12:15:34 +01:00
Michael Niedermayer
fa0e5ffb89
avfilter/vf_cropdetect: add yuv440p and yuv410p support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-27 05:06:14 +01:00
Michael Niedermayer
a4b13dbd02
avfilter/vf_fspp: Add GBRP and gray8 support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 23:47:15 +01:00
Reynaldo H. Verdejo Pinochet
a18456a203
ffserver: check for EOF|error at loop condition
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-12-26 19:02:16 -03:00
Reynaldo H. Verdejo Pinochet
0121ddabb8
ffserver: reflow close_connection()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-12-26 18:44:33 -03:00
Reynaldo H. Verdejo Pinochet
1146223699
ffserver: minor formatting improvement to http_server()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-12-26 18:34:52 -03:00
Reynaldo H. Verdejo Pinochet
978bc4327b
ffserver: reindent start_multicast()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-12-26 18:18:19 -03:00
Reynaldo H. Verdejo Pinochet
719cc02586
ffserver: reflow start_multicast()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-12-26 18:12:39 -03:00
Reynaldo H. Verdejo Pinochet
18011888cc
ffserver: reindent start_children()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-12-26 17:45:56 -03:00
Reynaldo H. Verdejo Pinochet
ec42251715
ffserver: reflow start_children()
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-12-26 17:45:56 -03:00
Reynaldo H. Verdejo Pinochet
1abdfb100a
ffserver: break lines at 80 in func prototypes
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-12-26 17:45:56 -03:00
James Almer
a4f876a1a2
x86/vf_fspp: move pxor in store slice functions out of the loop
...
m7 is not overwritten, so we only need to clear it once.
Found by Christophe Gisquet.
Signed-off-by: James Almer <jamrial@gmail.com>
2014-12-26 17:15:34 -03:00
James Almer
466e32bf25
x86/vf_fspp: port inline asm to yasm
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-12-26 15:39:51 -03:00
Michael Niedermayer
9224c7f0dd
avfilter/vf_fspp: clarify comment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 18:17:12 +01:00
Kieran Kunhya
18982f084c
swscale: Pass through chroma positions in sws_getCachedContext
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 17:55:12 +01:00
Michael Niedermayer
4bc0dbfc9f
avfilter/vf_boxblur: generate supported pixfmt list instead of hardcoding
...
This adds support for several more >8bit planar formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 15:09:59 +01:00
Michael Niedermayer
f7da4b1cf1
avformat/rtsp: Use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 14:59:29 +01:00
Michael Niedermayer
0704c44d68
avformat/cache: remove ftruncate usage, its not always available
...
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>
2014-12-26 12:41:15 +01:00
Stefano Sabatini
afaa4a8946
lavfi/blend: add difference128 mode
2014-12-26 11:24:48 +01:00
Michael Niedermayer
7c210c4424
avformat/cache: Extend cache entries if possible instead of creating new ones
...
This reduces the number of cache entries and should significantly
reduce memory requirements
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 02:21:51 +01:00
Michael Niedermayer
312151bb9a
avformat/cache: avoid lseek() on reading from the cache if possible
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 01:24:27 +01:00
Michael Niedermayer
ce3551896a
avformat/cache: keep cache_pos updated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 01:22:52 +01:00
Michael Niedermayer
954fc854f2
avformat/cache: cleanup cache file on cache write failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 01:13:49 +01:00
Michael Niedermayer
68609edd4a
Changelog: Mention non continuous cache protocol
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 00:49:22 +01:00
Clément Bœsch
6e6b0a8eed
avfilter/xbr: reindent after previous commit
2014-12-25 23:50:25 +01:00
Clément Bœsch
87984d2fe2
avfilter/xbr: refactor px calculation in FILT[234]
2014-12-25 23:50:25 +01:00
Clément Bœsch
20cac72a4f
avfilter/xbr: move alpha blend assignment out of the macros
2014-12-25 23:50:25 +01:00
Clément Bœsch
006caf03d7
avfilter/xbr: remove unused mask
2014-12-25 23:50:25 +01:00
Clément Bœsch
2188df96cf
avfilter/xbr: refactor alpha blending macros
2014-12-25 23:50:25 +01:00
Michael Niedermayer
8706910c4c
avformat/cache: Support user specified read-ahead for non seekable media
...
Fixes Ticket2406
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 22:09:24 +01:00
Michael Niedermayer
7018d3d351
avformat/cache: Use the correct io handle in seeking
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 22:07:32 +01:00
Michael Niedermayer
dedd3c89ae
avformat/cache: more informative error message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 22:07:32 +01:00
Michael Niedermayer
681559d3ff
avformat/cache: remember EOF point if hit and use it to handle SEEK_END
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 22:07:23 +01:00
Rémi Denis-Courmont
6c99c92a42
libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flag
...
This can be used by the application to signal its ability to cope with
video surface of types other than 8-bits YUV 4:2:0.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-12-25 20:47:49 +01:00
Rémi Denis-Courmont
57b6704ecd
avcodec: add AVCodecContext.sw_pix_fmt
...
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>
2014-12-25 20:47:49 +01:00
Rémi Denis-Courmont
4cfbeef31d
h264: factor hwaccel pixel formats list
...
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>
2014-12-25 20:47:48 +01:00
Michael Niedermayer
0c0168a210
avformat/cache: support non continuous caching
...
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>
2014-12-25 19:20:55 +01:00
Timo Rothenpieler
1efdb0a43f
avcodec/nvenc: Remove special cases for cygwin
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 15:54:26 +01:00
Michael Niedermayer
7dce91368f
avformat/smoothstreamingenc: Use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 12:51:48 +01:00
Michael Niedermayer
443bd2715d
avformat/wtvdec: Use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 12:51:48 +01:00
Michael Niedermayer
68fa549230
avformat/segment: Use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 12:51:48 +01:00
Kieran Kunhya
1515bfb313
vf_scale: Use correct chroma positions for YUV420P
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 02:53:29 +01:00
Michael Niedermayer
b51cc701bc
avcodec/vc1_mc: use the same reference as luma does in ff_vc1_mc_4mv_chroma()
...
Fixes Ticket3230
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 01:25:29 +01:00
James Almer
b94e85453e
avfilter/vf_fspp: add missing inline asm guards
2014-12-24 15:44:06 -03:00
Stefano Sabatini
a51c78c65d
lavfi/mp: drop mp=fspp filter
...
It has been ported to libavfilter.
2014-12-24 16:29:18 +01:00
Arwa Arif
bdc4db0ee3
lavfi: port mp=fspp to a native libavfilter filter
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-12-24 16:29:18 +01:00
Clément Bœsch
ecafde6606
avfilter/showwaves: fix height range for cline mode
2014-12-24 15:13:31 +01:00
Clément Bœsch
f6950a077c
avfilter/showwaves: use INT16_MAX instead of a self defined macro
2014-12-24 15:13:31 +01:00