Michael Niedermayer
dcb10ef9bf
Merge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7'
...
* commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7':
on2avc: Fix out of array access
See: ce6a1ff2a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 19:23:05 +01:00
Michael Niedermayer
89e705cd5c
Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'
...
* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c':
dv: Drop a spurious check
Conflicts:
libavcodec/dvdec.c
See: 5307fa00a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 19:11:14 +01:00
Arwa Arif
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
deccb4d827
avformat/http: simplify chained_options copying
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 14:30:32 +01:00
Brandon Lees
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
Shin-ichi Toyama
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
Michael Niedermayer
2fa6d21124
on2avc: Fix out of array access
...
CC: libav-stable@libav.org
Bug-Id: CID 1206648
2014-11-15 12:50:05 +01:00
Luca Barbato
74d7db586a
dv: Drop a spurious check
...
The buffer is always valid.
Bug-Id: CID 700682
2014-11-15 12:49:37 +01:00
Mika Raento
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
Michael Niedermayer
42c8db69b6
Merge commit '8562c1483ba647f562e4c1df68a9231274b80e6b'
...
* commit '8562c1483ba647f562e4c1df68a9231274b80e6b':
Icecast: Send content-type in all cases
See: 5e08b54f47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 11:52:43 +01:00
Michael Niedermayer
f3c324a0fe
Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'
...
* commit '3a6bb9735053c453f806ceab1d91124648d90aca':
Icecast: Send 100-continue header if possible
See: 17dc39e76b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 11:30:42 +01:00
Marvin Scholz
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
Marvin Scholz
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
Michael Niedermayer
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
Michael Niedermayer
fb3eb57369
avfilter/tinterlace: add Support for ff_lowpass_line_avx() & ff_lowpass_line_sse2()
...
Based-on: 2e1704059a
by Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 04:02:33 +01:00
Michael Niedermayer
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
by Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 03:25:43 +01:00
Michael Niedermayer
9d548fce24
avfilter/tinterlace: split context definition into seperate header so it can be used by future optimizations
...
Idea from 2e1704059a
from Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 03:22:35 +01:00
Michael Niedermayer
f043965cd5
avfilter/vf_tinterlace: fix linesize vs. width
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 03:03:58 +01:00
Mark Reid
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
85929b9caa
avcodec/lpc: remove unneeded {}
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:08:20 +01:00
Michael Niedermayer
d4065a9f47
Merge commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3'
...
* commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3':
lpc: always initialize ref and err
The initialization is not needed, its merged anyway as it might
help suppressing warnings and might make the code more robust against
future changes
See: c4a36b6f70
See: 0dd99628ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:05:25 +01:00
Michael Niedermayer
a5adeff457
Merge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f'
...
* commit '3a6ddfb8745e4b306a5637927fb057f630345e2f':
exr: check return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 01:55:21 +01:00
Michael Niedermayer
ac1735e76d
Merge commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1'
...
* commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1':
bgmc: fix sizeof arguments
See: 41bf943f70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 01:53:22 +01:00
Michael Niedermayer
720a8d2b75
Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'
...
* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
riff: support ProRes in avi (APCN fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 01:47:39 +01:00
Kieran Kunhya
2e1704059a
vf_interlace: Add SIMD for lowpass filter
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-11-15 00:35:31 +01:00
Vittorio Giovara
d16ec1b6db
atrac3plus: always initialize refwaves
...
CC: libav-stable@libav.org
Bug-Id: CID 1163851
2014-11-14 20:26:32 +01:00
Vittorio Giovara
60e0ee7ca2
lpc: always initialize ref and err
...
CC: libav-stable@libav.org
Bug-Id: CID 29585 / CID 700759
2014-11-14 20:25:52 +01:00
Vittorio Giovara
3a6ddfb874
exr: check return value
...
CC: libav-stable@libav.org
Bug-Id: CID 1198259
2014-11-14 20:25:21 +01:00
Thilo Borgmann
e4cb6abb2f
bgmc: fix sizeof arguments
...
CC: libav-devel@libav.org
Bug-Id: CID 608084 / CID 700724
2014-11-14 20:25:02 +01:00
Vittorio Giovara
4b39cc1a09
riff: support ProRes in avi (APCN fourcc)
2014-11-14 20:24:38 +01:00
Thilo Borgmann
e6e6149630
doc/indevs: Rework and update documentation of AVFoundation device.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 18:28:12 +01:00
Thilo Borgmann
d525e662e4
Changelog: Mention AVFoundation screen capturing.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 18:28:12 +01:00
Thilo Borgmann
2045334239
lavd/avfoundation: Introduce device alias 'none' to allow the user to record only audio or video.
...
Changes the selection of a default device to none instead of the system default device.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 18:28:12 +01:00
Carl Eugen Hoyos
cde0ad5ea7
tests/Makefile: Fix path for creation of ffprobe-test.nut.
2014-11-14 17:35:26 +01:00
Benoit Fouet
00df32f6a9
avcodec/pngdec: split frame decoding in its own function.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 17:20:43 +01:00
Benoit Fouet
8cab24df07
avcodec/pngdec: create a function to handle small (<=4) bits per pixel values.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 17:13:08 +01:00
Benoit Fouet
24ca2ffad8
avcodec/pngdec: use else if instead of if for small bpp handling.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 17:12:39 +01:00
Benoit Fouet
c25b6ae8a2
avcodec/pngdec: fix some indentation/whitespaces
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 16:59:03 +01:00
Benoit Fouet
6499e63f7b
avcodec/pngdec: create a function to decode tRNS chunk.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 16:58:37 +01:00
Benoit Fouet
4f313a50ee
avcodec/pngdec: create a function to decode PLTE chunk.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 16:17:00 +01:00
Benoit Fouet
b35fa04152
avcodec/pngdec: create a function to decode IDAT chunk.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 16:16:47 +01:00
Benoit Fouet
3f1eaf590c
avcodec/pngdec: create a function to decode pHYs chunk.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 15:58:35 +01:00
Benoit Fouet
1523d1484d
avcodec/pngdec: create a function to decode IHDR chunk.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 15:58:02 +01:00
Benoit Fouet
98abb98cb1
avcodec/pngdec: rename decode_frame to decode_frame_png
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 15:35:12 +01:00