Piotr Bandurski
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
Michael Niedermayer
5e29e91232
avcodec_align_dimensions2: add missing yuva formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-18 16:21:09 +02:00
Michael Niedermayer
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
Stefano Sabatini
d91e44301c
doc/filters: apply minor fixes to owdenoise documentation
2013-05-18 14:52:37 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
71b7427e9b
doc/fate: update server host key fingerprints
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-18 12:40:10 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Eli Friedman
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
Kostya Shishkov
cebdedca57
prores: decode alpha plane when it's present
2013-05-18 07:11:34 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Reimar Döffinger
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
Anton Khirnov
7e2b15c094
avfilter: check a malloc in avfilter_link().
...
Additionally change sizeof(type) into sizeof(var)
2013-05-17 20:32:27 +02:00
Anton Khirnov
bf5b5d2b15
avfilter.c: cosmetics, reformat
2013-05-17 20:32:18 +02:00
Anton Khirnov
d79bd60405
lavfi: factorize freeing a link
2013-05-17 20:30:25 +02:00
Anton Khirnov
1dd3561143
vf_format: do not use the AVFilterFormats internals.
...
Use the formats.h API instead.
2013-05-17 20:30:17 +02:00
Anton Khirnov
c5ab6088ad
af_aformat: cosmetics, fix indentation
2013-05-17 20:30:02 +02:00
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
006ec64877
lavr doxy: add version.h to the lavr group
2013-05-17 20:27:48 +02:00
Anton Khirnov
f0cebf51dd
lavc doxy: add avcodec.h to the libavcodec group.
2013-05-17 20:27:38 +02:00
Anton Khirnov
40020e171a
doxy: add a section about versioning.
2013-05-17 20:26:18 +02:00
Anton Khirnov
bc8c1cdc7b
lavfi doxy: add a page for lavfi.
2013-05-17 20:26:11 +02:00
Paul B Mahol
47ac344970
id3v2enc: chapter support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-17 16:52:55 +00:00
Luca Barbato
4a4107b489
jpegls: factorize return paths
2013-05-17 16:44:13 +02:00
Luca Barbato
a5a0ef5e13
jpegls: return meaningful errors
2013-05-17 16:44:13 +02:00
Luca Barbato
abad374909
jpegls: check the scan offset
...
Prevent an out of array bound write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-17 16:44:13 +02:00
Paul B Mahol
d26f637b02
libmodplug: fix sz type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-17 14:19:18 +00:00
Michael Kostylev
2768f7e4fe
sparc: VIS mnemonics
...
Currently, if VIS is enabled by configure, it will also be enabled at
run-time regardless of its support in the hardware. Thus, masking VIS
usage as it is done in vis.h by constructing binary instructions is
pointless. Using normal VIS mnemonics in inline assembly allows to take
advantage of automatic register allocation, gets rid of register
variables, which are unsupported by suncc for SPARC, and improves code
readability.
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-05-17 15:37:03 +02:00
Michael Niedermayer
ebe8c7fe52
vc1dec: restructure interpmvp code
...
This fixes a valgrind warning about use of uninitialized stuff
(no actual such use occurs though)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-17 15:11:47 +02:00
Vignesh Venkatasubramanian
98c292a7a8
Adding support for encoding VP8 Alpha
...
This patch adds support for encoding VP8 files with alpha. The alpha channel
is encoded separately and the output is placed in AVPacket's side_data. The
muxer then muxes it into the BlockAdditional element of the matroska container.
More details on spec here: http://goo.gl/wCP1y
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-17 15:11:23 +02:00
Michael Niedermayer
2fb193b1e7
vformat/matroskaenc: factorize alpha code in mkv_write_block()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-17 15:11:23 +02:00
Vignesh Venkatasubramanian
8ffcc826b3
Adding support for muxing VP8 Alpha files
...
This patch adds support for muxing VP8 Alpha Files. The Alpha channel data is
placed in BlockAdditional element of the matroska container. More information
& exact spec on how this is implemented can be found here: http://goo.gl/wCP1y
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-17 15:11:23 +02:00
Paul B Mahol
85e8a1169c
lavfi/pad: switch to AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-17 11:32:54 +00:00
Paul B Mahol
1d2ecf9609
lavfi/drawtext: switch to AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-17 11:32:54 +00:00
Paul B Mahol
83e892233c
lavfi/life: switch to AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-17 11:32:54 +00:00
Paul B Mahol
05b7560d39
lavfi/color: switch to AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-17 11:32:54 +00:00
Paul B Mahol
3a751eab78
lavu/opt: add AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-17 11:32:53 +00:00
Michael Niedermayer
1ec578c010
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
Conflicts:
libavcodec/mpegvideo.c
See: 73db0bf1b0
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-17 12:10:57 +02:00