]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 19 May 2013 09:06:39 +0000 (11:06 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Escape 130 FATE test
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 May 2013 08:53:39 +0000 (10:53 +0200)]
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>
Michael Niedermayer [Sun, 19 May 2013 08:27:11 +0000 (10:27 +0200)]
Merge commit '
ed50673066956d6f2201a57c3254569f2ab08d9d '
* commit '
ed50673066956d6f2201a57c3254569f2ab08d9d ':
wavpack: validate samples size parsed in wavpack_decode_block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 May 2013 08:22:05 +0000 (10:22 +0200)]
Merge commit '
8c34558131d846d2b10389564caadaa206372fd4 '
* commit '
8c34558131d846d2b10389564caadaa206372fd4 ':
wavpack: return meaningful errors
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 May 2013 08:10:00 +0000 (10:10 +0200)]
Merge commit '
0f689a3d97a1d3053ca0e9516b296909a72ff31e '
* commit '
0f689a3d97a1d3053ca0e9516b296909a72ff31e ':
wavpack: K&R formatting cosmetics
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sun, 19 May 2013 07:37:27 +0000 (09:37 +0200)]
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>
Kostya Shishkov [Tue, 14 May 2013 16:53:23 +0000 (18:53 +0200)]
Escape 130 FATE test
Kostya Shishkov [Sat, 18 May 2013 05:09:47 +0000 (07:09 +0200)]
prores: update FATE test to account for alpha plane present in the test sample
Carl Eugen Hoyos [Sat, 18 May 2013 23:48:39 +0000 (01:48 +0200)]
proresdec2: Only try to decode alpha plane if four output planes were allocated.
Fixes a crash with MPlayer.
Lukasz Marek [Wed, 15 May 2013 14:08:11 +0000 (16:08 +0200)]
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>
Luca Barbato [Tue, 14 May 2013 20:15:18 +0000 (22:15 +0200)]
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.
Luca Barbato [Fri, 17 May 2013 16:29:15 +0000 (18:29 +0200)]
wavpack: validate samples size parsed in wavpack_decode_block
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 17 May 2013 16:28:33 +0000 (18:28 +0200)]
wavpack: return meaningful errors
And forward those that were already meaningful.
Michael Niedermayer [Sat, 18 May 2013 16:28:59 +0000 (18:28 +0200)]
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>
Christophe Gisquet [Thu, 27 Dec 2012 21:33:51 +0000 (22:33 +0100)]
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>
Luca Barbato [Sat, 18 May 2013 14:02:47 +0000 (16:02 +0200)]
wavpack: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Kostya Shishkov [Sat, 18 May 2013 14:42:29 +0000 (16:42 +0200)]
proresdec2: Support decoding transparency information.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Jean First [Thu, 16 May 2013 21:35:05 +0000 (23:35 +0200)]
movenc: add video_track_timescale option
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 18 May 2013 13:23:20 +0000 (15:23 +0200)]
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>
Michael Niedermayer [Sat, 18 May 2013 14:19:06 +0000 (16:19 +0200)]
avcodec_align_dimensions2: add missing yuva formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 13:08:55 +0000 (15:08 +0200)]
sws/output: yuv2rgb_write() assert that alpha has the correct value in the tables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 16 May 2013 23:00:37 +0000 (01:00 +0200)]
doc/filters: apply minor fixes to owdenoise documentation
Michael Niedermayer [Sat, 18 May 2013 12:27:07 +0000 (14:27 +0200)]
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>
Michael Niedermayer [Sat, 18 May 2013 11:41:25 +0000 (13:41 +0200)]
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>
Michael Niedermayer [Sat, 18 May 2013 11:31:45 +0000 (13:31 +0200)]
Merge commit '
bf5b5d2b1561535cc013c12ab8033228bb0d0081 '
* commit '
bf5b5d2b1561535cc013c12ab8033228bb0d0081 ':
avfilter.c: cosmetics, reformat
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 11:10:57 +0000 (13:10 +0200)]
Merge commit '
d79bd6040599ef017dc45d5997fcc959ab1f71f6 '
* commit '
d79bd6040599ef017dc45d5997fcc959ab1f71f6 ':
lavfi: factorize freeing a link
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 10:46:54 +0000 (12:46 +0200)]
Merge commit '
1dd35611433c224e2231ed7ae26b5b560863a3cb '
* commit '
1dd35611433c224e2231ed7ae26b5b560863a3cb ':
vf_format: do not use the AVFilterFormats internals.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 10:40:10 +0000 (12:40 +0200)]
doc/fate: update server host key fingerprints
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 10:22:13 +0000 (12:22 +0200)]
Merge commit '
c5ab6088ad7b0dac461fb6757b038f5260e638e5 '
* commit '
c5ab6088ad7b0dac461fb6757b038f5260e638e5 ':
af_aformat: cosmetics, fix indentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 09:40:38 +0000 (11:40 +0200)]
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>
Michael Niedermayer [Sat, 18 May 2013 09:35:03 +0000 (11:35 +0200)]
Merge commit '
e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae '
* commit '
e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae ':
doxy: don't sort struct members alphabetically
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 09:25:44 +0000 (11:25 +0200)]
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>
Michael Niedermayer [Sat, 18 May 2013 09:17:52 +0000 (11:17 +0200)]
Merge commit '
40020e171a3549a2c0b65ce6f2649aec868872f2 '
* commit '
40020e171a3549a2c0b65ce6f2649aec868872f2 ':
doxy: add a section about versioning.
Conflicts:
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 09:04:11 +0000 (11:04 +0200)]
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>
Michael Niedermayer [Sat, 18 May 2013 08:22:20 +0000 (10:22 +0200)]
Merge commit '
4a4107b48944397c914aa39ee16a82fe44db8c4c '
* commit '
4a4107b48944397c914aa39ee16a82fe44db8c4c ':
jpegls: factorize return paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 May 2013 08:04:53 +0000 (10:04 +0200)]
Merge commit '
a5a0ef5e13a59ff53318a45d77c5624b23229c6f '
* commit '
a5a0ef5e13a59ff53318a45d77c5624b23229c6f ':
jpegls: return meaningful errors
sparc: VIS mnemonics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Eli Friedman [Fri, 16 Dec 2011 20:30:27 +0000 (21:30 +0100)]
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>
Kostya Shishkov [Fri, 17 May 2013 17:40:35 +0000 (19:40 +0200)]
prores: decode alpha plane when it's present
Michael Niedermayer [Wed, 15 May 2013 16:59:59 +0000 (18:59 +0200)]
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>
Michael Niedermayer [Fri, 17 May 2013 20:03:14 +0000 (22:03 +0200)]
avidec: dont randomly skip packets for offseting the index
Fixes Ticket2490
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Fri, 17 May 2013 18:28:03 +0000 (20:28 +0200)]
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>
Anton Khirnov [Mon, 1 Apr 2013 13:44:21 +0000 (15:44 +0200)]
avfilter: check a malloc in avfilter_link().
Additionally change sizeof(type) into sizeof(var)
Anton Khirnov [Mon, 1 Apr 2013 13:20:22 +0000 (15:20 +0200)]
avfilter.c: cosmetics, reformat
Anton Khirnov [Sun, 31 Mar 2013 15:18:43 +0000 (17:18 +0200)]
lavfi: factorize freeing a link
Anton Khirnov [Sun, 31 Mar 2013 14:58:49 +0000 (16:58 +0200)]
vf_format: do not use the AVFilterFormats internals.
Use the formats.h API instead.
Anton Khirnov [Sun, 31 Mar 2013 14:52:26 +0000 (16:52 +0200)]
af_aformat: cosmetics, fix indentation
Anton Khirnov [Sun, 31 Mar 2013 14:38:07 +0000 (16:38 +0200)]
lavfi: rename AVFilterFormats.format_count to nb_formats
This is more consistent with naming in the rest of Libav.
Anton Khirnov [Sun, 12 May 2013 12:55:54 +0000 (14:55 +0200)]
doxy: don't sort struct members alphabetically
The declaration order is more meanigful in most cases.
Anton Khirnov [Sun, 12 May 2013 12:54:43 +0000 (14:54 +0200)]
lavr doxy: add version.h to the lavr group
Anton Khirnov [Mon, 27 Feb 2012 10:34:03 +0000 (11:34 +0100)]
lavc doxy: add avcodec.h to the libavcodec group.
Anton Khirnov [Wed, 11 Apr 2012 13:45:22 +0000 (15:45 +0200)]
doxy: add a section about versioning.
Anton Khirnov [Wed, 11 Apr 2012 06:31:10 +0000 (08:31 +0200)]
lavfi doxy: add a page for lavfi.
Paul B Mahol [Mon, 6 May 2013 00:14:05 +0000 (00:14 +0000)]
id3v2enc: chapter support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Fri, 17 May 2013 10:38:44 +0000 (12:38 +0200)]
jpegls: factorize return paths
Luca Barbato [Fri, 17 May 2013 10:36:06 +0000 (12:36 +0200)]
jpegls: return meaningful errors
Luca Barbato [Fri, 17 May 2013 11:08:55 +0000 (13:08 +0200)]
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
Paul B Mahol [Fri, 17 May 2013 14:19:18 +0000 (14:19 +0000)]
libmodplug: fix sz type
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Kostylev [Thu, 16 May 2013 13:29:46 +0000 (09:29 -0400)]
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>
Michael Niedermayer [Fri, 17 May 2013 13:05:55 +0000 (15:05 +0200)]
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>
Vignesh Venkatasubramanian [Wed, 8 May 2013 23:59:33 +0000 (16:59 -0700)]
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>
Michael Niedermayer [Fri, 17 May 2013 11:58:07 +0000 (13:58 +0200)]
vformat/matroskaenc: factorize alpha code in mkv_write_block()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Wed, 8 May 2013 23:59:32 +0000 (16:59 -0700)]
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>
Paul B Mahol [Mon, 13 May 2013 15:08:40 +0000 (15:08 +0000)]
lavfi/pad: switch to AV_OPT_TYPE_COLOR
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 13 May 2013 15:02:59 +0000 (15:02 +0000)]
lavfi/drawtext: switch to AV_OPT_TYPE_COLOR
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 13 May 2013 14:52:21 +0000 (14:52 +0000)]
lavfi/life: switch to AV_OPT_TYPE_COLOR
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 13 May 2013 14:27:05 +0000 (14:27 +0000)]
lavfi/color: switch to AV_OPT_TYPE_COLOR
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 13 May 2013 12:56:09 +0000 (12:56 +0000)]
lavu/opt: add AV_OPT_TYPE_COLOR
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 17 May 2013 10:05:50 +0000 (12:05 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
Conflicts:
libavcodec/mpegvideo.c
See:
73db0bf1b06084022db5f42377b3b7960b3d3f5e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 May 2013 09:55:33 +0000 (11:55 +0200)]
Merge commit '
db8e336e5fc18c41cb4e9bab1960349e9800d546 '
* commit '
db8e336e5fc18c41cb4e9bab1960349e9800d546 ':
pthread: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 May 2013 09:49:00 +0000 (11:49 +0200)]
Merge commit '
30e256430eb88c6d4c382581b89bca171d79fbc0 '
* commit '
30e256430eb88c6d4c382581b89bca171d79fbc0 ':
lavc/pthread: remove obsolete checks
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 May 2013 09:41:09 +0000 (11:41 +0200)]
Merge commit '
16a645adeb758207346a4bbf66766f02734c461e '
* commit '
16a645adeb758207346a4bbf66766f02734c461e ':
vf_pixdesctest: make config_props work properly when called multiple times.
vf_hqdn3d: make config_props work properly when called multiple times.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 May 2013 09:28:15 +0000 (11:28 +0200)]
Merge commit '
3fb29588a27a711132106b924e27b53789a58dcb '
* commit '
3fb29588a27a711132106b924e27b53789a58dcb ':
vf_drawtext: don't leak the expressions.
vf_crop: make config_props work properly when called multiple times.
vf_setdar: make config_props work properly when called multiple times.
Conflicts:
libavfilter/vf_aspect.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 May 2013 09:05:18 +0000 (11:05 +0200)]
Merge commit '
4c205f42c86ccefa093c59434669af34ad14a52b '
* commit '
4c205f42c86ccefa093c59434669af34ad14a52b ':
vf_drawbox: make config_props work properly when called multiple times.
vf_drawtext: do not reset the frame number in config_input.
vf_fps: move initializing pts from config_props to init.
Conflicts:
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 May 2013 08:51:59 +0000 (10:51 +0200)]
Merge commit '
d371c3c2e2830d9783465ecfe1ab7d93351083b7 '
* commit '
d371c3c2e2830d9783465ecfe1ab7d93351083b7 ':
vf_frei0r: make config_props work properly when called multiple times.
vf_gradfun: make config_props work properly when called multiple times.
vf_lut: make config_props work properly when called multiple times.
Conflicts:
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 May 2013 08:37:36 +0000 (10:37 +0200)]
Merge commit '
1232a1647ab27e024a3baf4d01d40c8d08d6ced9 '
* commit '
1232a1647ab27e024a3baf4d01d40c8d08d6ced9 ':
Apple Intermediate Codec decoder
movenc: Don't add base_data_offset in tfhd for PIFF files
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 May 2013 08:23:40 +0000 (10:23 +0200)]
Merge commit '
1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f '
* commit '
1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f ':
vc1dec: Add support for interlaced B-frames
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jeremy Hinegardner [Sun, 24 Mar 2013 05:15:31 +0000 (23:15 -0600)]
Turn off usage of base_data_offset in tfhd for PIFF files
According to the PIFF specification[1] the base_data_offset field MUST be
omitteed. See section 5.2.17. Since the ISMV files created by ffmpeg state
that they are 'piff' compatible via 'ftyp' box, this needs to be corrected.
[1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jindrich Makovicka [Thu, 16 May 2013 14:49:28 +0000 (16:49 +0200)]
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
MPV_decode_mb_internal needs 3 * 16 * linesize bytes of scratch buffer
For interlaced content, linesize is multiplied by two after the allocation
of the scratch buffer, and the dest_cr pointer ends past the buffer.
This patch makes ff_mpv_frame_size_alloc allocate a total of
(aligned line_size) * 2 * 16 * 3 bytes, which suffices even for the
interlaced case.
CC:libav-stable@libav.org
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 11 May 2013 15:32:52 +0000 (17:32 +0200)]
pthread: reindent
Anton Khirnov [Sat, 11 May 2013 15:30:53 +0000 (17:30 +0200)]
lavc/pthread: remove obsolete checks
Those were useful when avcodec_thread_init() was a public functions. It
was deprecated and removed some time ago, so those checks are not needed
anymore.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_pixdesctest: make config_props work properly when called multiple times.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_hqdn3d: make config_props work properly when called multiple times.
Do not leak all the temp buffers.
Anton Khirnov [Mon, 18 Mar 2013 21:13:35 +0000 (22:13 +0100)]
vf_drawtext: don't leak the expressions.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_crop: make config_props work properly when called multiple times.
Do not leak the x/y expressions.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_setdar: make config_props work properly when called multiple times.
Do not overwrite the variable set through AVOptions.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_drawbox: make config_props work properly when called multiple times.
Do not overwrite the variables set through AVOptions.
Anton Khirnov [Mon, 18 Mar 2013 21:07:10 +0000 (22:07 +0100)]
vf_drawtext: do not reset the frame number in config_input.
Frame number should be incremented normally even if the link properties
change.
Anton Khirnov [Mon, 18 Mar 2013 21:32:39 +0000 (22:32 +0100)]
vf_fps: move initializing pts from config_props to init.
It should not be reinitialized if the link properties change.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_frei0r: make config_props work properly when called multiple times.
Do not leak the initialized filter instance.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_gradfun: make config_props work properly when called multiple times.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_lut: make config_props work properly when called multiple times.
Do not leak the expressions.
Kostya Shishkov [Thu, 16 May 2013 05:21:08 +0000 (07:21 +0200)]
Apple Intermediate Codec decoder
Carl Eugen Hoyos [Fri, 17 May 2013 00:32:21 +0000 (02:32 +0200)]
configure: Autodetect VA-API
This fixes a regression (reproducible since 1.2) and restores the
behaviour of 0.6, 0.7, 0.8, 0.9, 0.10, 0.11, 1.0 and 1.1.
Stefano Sabatini [Thu, 16 May 2013 22:43:02 +0000 (00:43 +0200)]
lavfi/drawbox: restore verbal form for drawbox options descriptions
Stefano Sabatini [Tue, 14 May 2013 19:04:03 +0000 (21:04 +0200)]
lavfi: factorize drawgrid and drawbox code
James Almer [Thu, 16 May 2013 22:10:28 +0000 (19:10 -0300)]
tools/ffhash: Use O_BINARY when available
This fixes reading files in Windows
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 May 2013 22:17:48 +0000 (00:17 +0200)]
avcodec/pthread: fix ffv1 with 2 threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jeremy Hinegardner [Sun, 24 Mar 2013 05:15:31 +0000 (23:15 -0600)]
movenc: Don't add base_data_offset in tfhd for PIFF files
According to the PIFF specification[1] the base_data_offset field MUST be
omitteed. See section 5.2.17. Since the ISMV files created by libavformat
state that they are 'piff' compatible via 'ftyp' box, this needs to be
corrected.
[1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format
Signed-off-by: Martin Storsjö <martin@martin.st>
Sebastian Sandberg [Thu, 31 Jan 2013 17:04:22 +0000 (18:04 +0100)]
vc1dec: Add support for interlaced B-frames
Signed-off-by: Martin Storsjö <martin@martin.st>
Clément Bœsch [Thu, 16 May 2013 17:04:36 +0000 (19:04 +0200)]
lavf/img2enc: use FF_CEIL_RSHIFT().