fa6001e728
Merge commit '8e673efc6f5b7a095557664660305148f2788d30'
...
* commit '8e673efc6f5b7a095557664660305148f2788d30':
prores: update FATE test to account for alpha plane present in the test sample
configure: Add basic valgrind-massif support
Conflicts:
tests/fate/prores.mak
tests/ref/fate/prores-alpha
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:53:39 +02:00
3e3514bce2
Merge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d'
...
* commit 'ed50673066956d6f2201a57c3254569f2ab08d9d':
wavpack: validate samples size parsed in wavpack_decode_block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:38:08 +02:00
2ad415cfa4
Merge commit '8c34558131d846d2b10389564caadaa206372fd4'
...
* commit '8c34558131d846d2b10389564caadaa206372fd4':
wavpack: return meaningful errors
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:22:05 +02:00
02788d2ac5
Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'
...
* commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e':
wavpack: K&R formatting cosmetics
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:10:00 +02:00
df07a833f1
ftp: favor strtoll over atoll
...
Both strtoll and atoll have different names on MSVC, and strtoll has a
compatibility layer in place for this case.
Fixes compilation on MSVC.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:02:44 +02:00
8e673efc6f
prores: update FATE test to account for alpha plane present in the test sample
2013-05-19 07:09:23 +02:00
e32bbd4112
proresdec2: Only try to decode alpha plane if four output planes were allocated.
...
Fixes a crash with MPlayer.
2013-05-19 01:48:39 +02:00
c86d3a54de
FTP protocol support
...
Implementation of ftp protocol.
Fixes #1672
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 22:16:02 +02:00
edfe609fc9
configure: Add basic valgrind-massif support
...
With the parameter --toolchain valgrind-massif, the configure
script sets reasonable defaults that can be overridden as explained
in the documentation.
2013-05-18 21:29:17 +02:00
ed50673066
wavpack: validate samples size parsed in wavpack_decode_block
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-18 20:39:32 +02:00
8c34558131
wavpack: return meaningful errors
...
And forward those that were already meaningful.
2013-05-18 20:37:18 +02:00
9f88db5df1
avfilter/vf_deshake: check rx
...
Fixes crash on SSE2
Fixes Ticket2443
Note, its possible to restructure the code to avoid the 16pixel limitation,
and such change is welcome!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 18:28:59 +02:00
f49564c607
fmtconvert: int32_t input to int32_to_float_fmul_scalar
...
It was previously declared as int.
Does not change fate results for x86.
Conflicts:
libavcodec/ppc/fmtconvert_altivec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 18:01:16 +02:00
0f689a3d97
wavpack: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-18 17:19:43 +02:00
d13fa0e995
proresdec2: Support decoding transparency information.
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-05-18 16:48:34 +02:00
7e570f027b
movenc: add video_track_timescale option
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 16:42:36 +02:00
7baef22fca
mov: set block_align for MACE 3:1 and MACE 6:1
...
fixes remuxing of audio track from mov to aifc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 16:26:50 +02:00
5e29e91232
avcodec_align_dimensions2: add missing yuva formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 16:21:09 +02:00
e1efacf60b
sws/output: yuv2rgb_write() assert that alpha has the correct value in the tables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 15:14:19 +02:00
d91e44301c
doc/filters: apply minor fixes to owdenoise documentation
2013-05-18 14:52:37 +02:00
ed0aed09e8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Escape 130 (RPL) decoder
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/codec_desc.c
libavcodec/escape130.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 14:31:01 +02:00
849bb62c2c
Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'
...
* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
prores: decode alpha plane when it's present
avfilter: check a malloc in avfilter_link().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:41:47 +02:00
d56ced5fbf
Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'
...
* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
avfilter.c: cosmetics, reformat
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:36:49 +02:00
fb8dde37e4
Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'
...
* commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6':
lavfi: factorize freeing a link
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:10:57 +02:00
dd2eaf57b7
Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'
...
* commit '1dd35611433c224e2231ed7ae26b5b560863a3cb':
vf_format: do not use the AVFilterFormats internals.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 12:47:22 +02:00
71b7427e9b
doc/fate: update server host key fingerprints
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 12:40:10 +02:00
4742edd50e
Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'
...
* commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5':
af_aformat: cosmetics, fix indentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 12:22:25 +02:00
74cb7ef851
Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'
...
* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0':
lavfi: rename AVFilterFormats.format_count to nb_formats
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/filtfmts.c
libavfilter/formats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:46:09 +02:00
937af7f6d3
Merge commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae'
...
* commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae':
doxy: don't sort struct members alphabetically
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:35:51 +02:00
20f75a810c
Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'
...
* commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca':
lavr doxy: add version.h to the lavr group
lavc doxy: add avcodec.h to the libavcodec group.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:25:58 +02:00
97200d89b9
Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'
...
* commit '40020e171a3549a2c0b65ce6f2649aec868872f2':
doxy: add a section about versioning.
Conflicts:
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:17:52 +02:00
0718f0cc24
Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'
...
* commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec':
lavfi doxy: add a page for lavfi.
jpegls: check the scan offset
Conflicts:
libavcodec/jpeglsdec.c
libavfilter/avfilter.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:04:11 +02:00
7d84bb2bcc
Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'
...
* commit '4a4107b48944397c914aa39ee16a82fe44db8c4c':
jpegls: factorize return paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 10:22:39 +02:00
b53d6a47c5
Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'
...
* commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f':
jpegls: return meaningful errors
sparc: VIS mnemonics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 10:05:00 +02:00
350914fc80
Escape 130 (RPL) decoder
...
Some fixes provided by Paul B Mahol <onemda@gmail.com>
and Michael Niedermayer <michaelni@gmx.at> and me.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2013-05-18 07:12:56 +02:00
cebdedca57
prores: decode alpha plane when it's present
2013-05-18 07:11:34 +02:00
5918b7ac41
sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 01:20:30 +02:00
6c593f1b67
avidec: dont randomly skip packets for offseting the index
...
Fixes Ticket2490
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 22:16:10 +02:00
24c65eb29f
md5: avoid unnecessary copying.
...
Where necessary use memcpy instead.
Thanks to Giorgio Vazzana [mywing81 gmail] for
spotting this loop as the cause for the bad
performance.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-17 21:16:02 +02:00
7e2b15c094
avfilter: check a malloc in avfilter_link().
...
Additionally change sizeof(type) into sizeof(var)
2013-05-17 20:32:27 +02:00
bf5b5d2b15
avfilter.c: cosmetics, reformat
2013-05-17 20:32:18 +02:00
d79bd60405
lavfi: factorize freeing a link
2013-05-17 20:30:25 +02:00
1dd3561143
vf_format: do not use the AVFilterFormats internals.
...
Use the formats.h API instead.
2013-05-17 20:30:17 +02:00
c5ab6088ad
af_aformat: cosmetics, fix indentation
2013-05-17 20:30:02 +02:00
b01f6041f4
lavfi: rename AVFilterFormats.format_count to nb_formats
...
This is more consistent with naming in the rest of Libav.
2013-05-17 20:29:50 +02:00
e27f4b7cbf
doxy: don't sort struct members alphabetically
...
The declaration order is more meanigful in most cases.
2013-05-17 20:27:52 +02:00
006ec64877
lavr doxy: add version.h to the lavr group
2013-05-17 20:27:48 +02:00
f0cebf51dd
lavc doxy: add avcodec.h to the libavcodec group.
2013-05-17 20:27:38 +02:00
40020e171a
doxy: add a section about versioning.
2013-05-17 20:26:18 +02:00
bc8c1cdc7b
lavfi doxy: add a page for lavfi.
2013-05-17 20:26:11 +02:00
Michael Niedermayer
Hendrik Leppkes
Kostya Shishkov
Carl Eugen Hoyos
Lukasz Marek
Luca Barbato
Christophe Gisquet
Jean First
Piotr Bandurski
Stefano Sabatini
Eli Friedman
Reimar Döffinger
Anton Khirnov