f3cba01cce
Merge commit 'c00365b46d464ce47716315c1801818d811bdb9a'
...
* commit 'c00365b46d464ce47716315c1801818d811bdb9a':
aarch64: Make the function pointer tables position independent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-16 01:05:31 +01:00
c00365b46d
aarch64: Make the function pointer tables position independent
...
This allows running the code on android, where 64 bit binaries with
text relocations aren't allowed to be loaded.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-16 01:07:24 +02:00
77204f7366
avfilter/xbr: fix style in FILT4() calls
2014-11-15 22:48:22 +01:00
7eece06934
avfilter/xbr: clarify default "interpolated" pixels assignments
2014-11-15 22:46:19 +01:00
bca3c2cfc0
avfilter/xbr: refactor xbr[234]x into a single function
...
No speed difference.
2014-11-15 22:35:29 +01:00
8bc1553cdb
avfilter/xbr: add slice threading
2014-11-15 22:15:32 +01:00
bd7d8604bd
avcodec/nellymoserenc: update comment to match 5c805d69a4
...
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 22:12:35 +01:00
454b714283
avfilter/xbr: add video and filtering flags to options
...
Fixes ffmpeg -h filter=xbr
2014-11-15 21:22:00 +01:00
be96201e5b
avfilter/xbr: use function pointers for xbr[234]x
2014-11-15 21:18:18 +01:00
c4fb79a3db
avfilter/xbr: remove FATE test entry from @todo
...
See 57688aecbd
2014-11-15 21:13:18 +01:00
9a796f7f18
avfilter/xbr: consistent copyright header
2014-11-15 21:06:13 +01:00
d1529273fb
avfilter/xbr: make xbr[234]x a bit more consistent
2014-11-15 21:06:13 +01:00
a99004a926
avfilter/xbr: misc style fixes
2014-11-15 21:01:40 +01:00
fda209b741
avfilter/xbr: simplify left/up conditions
2014-11-15 21:01:40 +01:00
a3c3ee6973
avfilter/xbr: misc cleanup in FILT[234] macros
2014-11-15 21:01:40 +01:00
7e91f77547
avfilter/xbr: refactor src/dst pointers definitions into a macro
2014-11-15 21:01:39 +01:00
18e4bf4f54
avfilter/xbr: refactor the 21 pixels definition into a macro
2014-11-15 21:01:39 +01:00
6bf9786a9b
avfilter/xbr: mark source pointers as const
2014-11-15 21:01:36 +01:00
e070484040
avfilter/xbr: simplify width overread checks
2014-11-15 20:31:41 +01:00
55f05ac0f1
avfilter/xbr: use different macro names for each dimension
2014-11-15 20:31:41 +01:00
9f9c741771
avfilter/xbr: avoid unecessary macro redirections
2014-11-15 20:31:41 +01:00
086487b633
avfilter/xbr: localize some filtering variables
2014-11-15 20:31:41 +01:00
08bb6f919c
avfilter/xbr: do not pass unchanging r2y to macros
2014-11-15 20:31:41 +01:00
aea7616d39
lavfi/xbr: remove relicensing notice from copyright header
...
The log is good enough for tracking those changes.
2014-11-15 20:13:53 +01:00
dcb10ef9bf
Merge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7'
...
* commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7':
on2avc: Fix out of array access
See: ce6a1ff2a1
2014-11-15 19:23:05 +01:00
89e705cd5c
Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'
...
* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c':
dv: Drop a spurious check
Conflicts:
libavcodec/dvdec.c
See: 5307fa00a4
2014-11-15 19:11:14 +01:00
a2f05d3337
lavfi : change xBR filter to LGPL
...
Hyllian's message : "Hi, Put lgpl on this and use it as you wish. It's free!"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 18:54:54 +01:00
7d37e45f6b
avcodec/mpeg4video_parser: fix spurious extradata parse warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 17:30:44 +01:00
10411afdff
avcodec/mpeg4videodec: replace some return -1 by more specific error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 17:24:36 +01:00
18fcdc0981
avcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 17:09:37 +01:00
deccb4d827
avformat/http: simplify chained_options copying
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 14:30:32 +01:00
ffaf2074eb
Fix the timeout option not working when connecting to a HTTP url that requires authentication.
...
In http_open_cnx, the patch restores the AVDictionary if connection needs to be re-tried
because of a authentication/redirect status code.
Previously, if a 401/407/30x status code was encountered, http_open_cnx would restart at the redo label, but any options
used by the underlying protocol would be missing because they were removed by the first attempt.
Signed-off-by: Brandon Lees <brandon@n-hega.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 14:30:32 +01:00
12630fa821
avcodec/dvdsubdec: New option for obtaining global palette from .IFO file (experimental)
...
Suggested-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 12:50:39 +01:00
2fa6d21124
on2avc: Fix out of array access
...
CC: libav-stable@libav.org
Bug-Id: CID 1206648
2014-11-15 12:50:05 +01:00
74d7db586a
dv: Drop a spurious check
...
The buffer is always valid.
Bug-Id: CID 700682
2014-11-15 12:49:37 +01:00
b08fd7ea78
mov.c: fix handling of seek return in read_mfra
...
this would cause mfra to be ignored in files larger than 2G
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 12:04:34 +01:00
42c8db69b6
Merge commit '8562c1483ba647f562e4c1df68a9231274b80e6b'
...
* commit '8562c1483ba647f562e4c1df68a9231274b80e6b':
Icecast: Send content-type in all cases
See: 5e08b54f47
2014-11-15 11:52:43 +01:00
f3c324a0fe
Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'
...
* commit '3a6bb9735053c453f806ceab1d91124648d90aca':
Icecast: Send 100-continue header if possible
See: 17dc39e76b
2014-11-15 11:30:42 +01:00
8562c1483b
Icecast: Send content-type in all cases
...
This is needed because Icecast since version 2.4.1 doesn't default
to audio/mpeg anymore. AVOption default not used here, since a later
check if -content_type is set is performed and would break.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-11-15 09:15:39 +01:00
3a6bb97350
Icecast: Send 100-continue header if possible
...
This allows for proper error reporting. Only do
this for non-legacy requests as only Icecast >2.4.0
will reply with a proper status.
Libav seems to accept both, 100 and 200 status codes, but
let's stay close to spec.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-11-15 09:14:04 +01:00
05e4b25e9b
avfilter/x86/vf_interlace: rewrite asm
...
4775 decicycles -> 3688 decicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 04:09:03 +01:00
fb3eb57369
avfilter/tinterlace: add Support for ff_lowpass_line_avx() & ff_lowpass_line_sse2()
...
Based-on: 2e1704059a
2014-11-15 04:02:33 +01:00
18b46ecc93
avfilter/tinterlace: Move lowpass_line to a separate function and call it through a function pointer
...
This permits replacing it by a optimized implementation
Based-on / Idea-from: 2e1704059a
2014-11-15 03:25:43 +01:00
9d548fce24
avfilter/tinterlace: split context definition into seperate header so it can be used by future optimizations
...
Idea from 2e1704059a
2014-11-15 03:22:35 +01:00
f043965cd5
avfilter/vf_tinterlace: fix linesize vs. width
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 03:03:58 +01:00
933eca91e6
libavformat/mxfdec.c: refactored resolving timecode component
...
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:45:53 +01:00
05e0ea6050
avfilter/vf_tinterlace: Fix output top field first flag for MODE_INTERLACEX2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:45:13 +01:00
6f373d75e8
Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'
...
* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
vf_interlace: Add SIMD for lowpass filter
Conflicts:
libavfilter/vf_interlace.c
libavfilter/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:39:49 +01:00
53ab7846ee
Merge commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710'
...
* commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710':
atrac3plus: always initialize refwaves
The initialization is not needed, the array is never read before
being written to. Its merged anyway for robustness in respect to
future changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:17:54 +01:00
85929b9caa
avcodec/lpc: remove unneeded {}
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:08:20 +01:00
Michael Niedermayer
Martin Storsjö
Clément Bœsch
Stefano Sabatini
Arwa Arif
Brandon Lees
Shin-ichi Toyama
Luca Barbato
Mika Raento
Marvin Scholz
Mark Reid