ffmpeg.git
6 years agomov: set block_align for MACE 3:1 and MACE 6:1
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>
6 years agoavcodec_align_dimensions2: add missing yuva formats
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>
6 years agosws/output: yuv2rgb_write() assert that alpha has the correct value in the tables
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>
6 years agodoc/filters: apply minor fixes to owdenoise documentation
Stefano Sabatini [Thu, 16 May 2013 23:00:37 +0000 (01:00 +0200)]
doc/filters: apply minor fixes to owdenoise documentation

6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'
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>
6 years agoMerge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'
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>
6 years agoMerge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'
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>
6 years agoMerge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'
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>
6 years agodoc/fate: update server host key fingerprints
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>
6 years agoMerge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'
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>
6 years agoMerge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'
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>
6 years agoMerge commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae'
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>
6 years agoMerge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'
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>
6 years agoMerge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'
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>
6 years agoMerge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'
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>
6 years agoMerge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'
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>
6 years agoMerge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'
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>
6 years agoEscape 130 (RPL) decoder
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>
6 years agoprores: decode alpha plane when it's present
Kostya Shishkov [Fri, 17 May 2013 17:40:35 +0000 (19:40 +0200)]
prores: decode alpha plane when it's present

6 years agosws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input
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>
6 years agoavidec: dont randomly skip packets for offseting the index
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>
6 years agomd5: avoid unnecessary copying.
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>
6 years agoavfilter: check a malloc in avfilter_link().
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)

6 years agoavfilter.c: cosmetics, reformat
Anton Khirnov [Mon, 1 Apr 2013 13:20:22 +0000 (15:20 +0200)]
avfilter.c: cosmetics, reformat

6 years agolavfi: factorize freeing a link
Anton Khirnov [Sun, 31 Mar 2013 15:18:43 +0000 (17:18 +0200)]
lavfi: factorize freeing a link

6 years agovf_format: do not use the AVFilterFormats internals.
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.

6 years agoaf_aformat: cosmetics, fix indentation
Anton Khirnov [Sun, 31 Mar 2013 14:52:26 +0000 (16:52 +0200)]
af_aformat: cosmetics, fix indentation

6 years agolavfi: rename AVFilterFormats.format_count to nb_formats
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.

6 years agodoxy: don't sort struct members alphabetically
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.

6 years agolavr doxy: add version.h to the lavr group
Anton Khirnov [Sun, 12 May 2013 12:54:43 +0000 (14:54 +0200)]
lavr doxy: add version.h to the lavr group

6 years agolavc doxy: add avcodec.h to the libavcodec group.
Anton Khirnov [Mon, 27 Feb 2012 10:34:03 +0000 (11:34 +0100)]
lavc doxy: add avcodec.h to the libavcodec group.

6 years agodoxy: add a section about versioning.
Anton Khirnov [Wed, 11 Apr 2012 13:45:22 +0000 (15:45 +0200)]
doxy: add a section about versioning.

6 years agolavfi doxy: add a page for lavfi.
Anton Khirnov [Wed, 11 Apr 2012 06:31:10 +0000 (08:31 +0200)]
lavfi doxy: add a page for lavfi.

6 years agoid3v2enc: chapter support
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>
6 years agojpegls: factorize return paths
Luca Barbato [Fri, 17 May 2013 10:38:44 +0000 (12:38 +0200)]
jpegls: factorize return paths

6 years agojpegls: return meaningful errors
Luca Barbato [Fri, 17 May 2013 10:36:06 +0000 (12:36 +0200)]
jpegls: return meaningful errors

6 years agojpegls: check the scan offset
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
6 years agolibmodplug: fix sz type
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>
6 years agosparc: VIS mnemonics
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>
6 years agovc1dec: restructure interpmvp code
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>
6 years agoAdding support for encoding VP8 Alpha
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>
6 years agovformat/matroskaenc: factorize alpha code in mkv_write_block()
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>
6 years agoAdding support for muxing VP8 Alpha files
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>
6 years agolavfi/pad: switch to AV_OPT_TYPE_COLOR
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>
6 years agolavfi/drawtext: switch to AV_OPT_TYPE_COLOR
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>
6 years agolavfi/life: switch to AV_OPT_TYPE_COLOR
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>
6 years agolavfi/color: switch to AV_OPT_TYPE_COLOR
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>
6 years agolavu/opt: add AV_OPT_TYPE_COLOR
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546'
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>
6 years agoMerge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'
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>
6 years agoMerge commit '16a645adeb758207346a4bbf66766f02734c461e'
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>
6 years agoMerge commit '3fb29588a27a711132106b924e27b53789a58dcb'
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>
6 years agoMerge commit '4c205f42c86ccefa093c59434669af34ad14a52b'
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>
6 years agoMerge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'
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>
6 years agoMerge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'
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>
6 years agoMerge commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f'
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>
6 years agoTurn off usage of base_data_offset in tfhd for PIFF files
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>
6 years agompegvideo: allocate sufficiently large scratch buffer for interlaced vid
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>
6 years agopthread: reindent
Anton Khirnov [Sat, 11 May 2013 15:32:52 +0000 (17:32 +0200)]
pthread: reindent

6 years agolavc/pthread: remove obsolete checks
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.

6 years agovf_pixdesctest: make config_props work properly when called multiple times.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_pixdesctest: make config_props work properly when called multiple times.

6 years agovf_hqdn3d: 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.

6 years agovf_drawtext: don't leak the expressions.
Anton Khirnov [Mon, 18 Mar 2013 21:13:35 +0000 (22:13 +0100)]
vf_drawtext: don't leak the expressions.

6 years agovf_crop: make config_props work properly when called multiple times.
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.

6 years agovf_setdar: make config_props work properly when called multiple times.
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.

6 years agovf_drawbox: make config_props work properly when called multiple times.
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.

6 years agovf_drawtext: do not reset the frame number in config_input.
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.

6 years agovf_fps: move initializing pts from config_props to init.
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.

6 years agovf_frei0r: make config_props work properly when called multiple times.
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.

6 years agovf_gradfun: make config_props work properly when called multiple times.
Anton Khirnov [Mon, 18 Mar 2013 20:31:54 +0000 (21:31 +0100)]
vf_gradfun: make config_props work properly when called multiple times.

6 years agovf_lut: 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.

6 years agoApple Intermediate Codec decoder
Kostya Shishkov [Thu, 16 May 2013 05:21:08 +0000 (07:21 +0200)]
Apple Intermediate Codec decoder

6 years agoconfigure: Autodetect VA-API
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.

6 years agolavfi/drawbox: restore verbal form for drawbox options descriptions
Stefano Sabatini [Thu, 16 May 2013 22:43:02 +0000 (00:43 +0200)]
lavfi/drawbox: restore verbal form for drawbox options descriptions

6 years agolavfi: factorize drawgrid and drawbox code
Stefano Sabatini [Tue, 14 May 2013 19:04:03 +0000 (21:04 +0200)]
lavfi: factorize drawgrid and drawbox code

6 years agotools/ffhash: Use O_BINARY when available
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>
6 years agoavcodec/pthread: fix ffv1 with 2 threads
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>
6 years agomovenc: Don't add base_data_offset in tfhd for PIFF files
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>
6 years agovc1dec: Add support for interlaced B-frames
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>
6 years agolavf/img2enc: use FF_CEIL_RSHIFT().
Clément Bœsch [Thu, 16 May 2013 17:04:36 +0000 (19:04 +0200)]
lavf/img2enc: use FF_CEIL_RSHIFT().

6 years agolavfi/yadif: fix chroma subsampling with odd sizes.
Clément Bœsch [Thu, 16 May 2013 17:02:32 +0000 (19:02 +0200)]
lavfi/yadif: fix chroma subsampling with odd sizes.

6 years agolavfi/idet: fix chroma subsampling with odd sizes.
Clément Bœsch [Thu, 16 May 2013 17:02:19 +0000 (19:02 +0200)]
lavfi/idet: fix chroma subsampling with odd sizes.

6 years agolavc/vc1dec: fix a few "may be used uninitialized" warnings.
Clément Bœsch [Mon, 13 May 2013 15:04:51 +0000 (17:04 +0200)]
lavc/vc1dec: fix a few "may be used uninitialized" warnings.

6 years agolibvpxenc: Fix "passing argument 3 of av_image_copy from incompatible pointer type...
Michael Niedermayer [Thu, 16 May 2013 20:54:16 +0000 (22:54 +0200)]
libvpxenc: Fix "passing argument 3 of av_image_copy from incompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: silence "may be used uninitialized in this function" warning from gcc
Michael Niedermayer [Thu, 16 May 2013 20:25:31 +0000 (22:25 +0200)]
vc1dec: silence "may be used uninitialized in this function" warning from gcc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: silence a discarded const qualifier warning.
Clément Bœsch [Sat, 11 May 2013 20:29:46 +0000 (22:29 +0200)]
lavfi: silence a discarded const qualifier warning.

6 years agoRename ffadler to ffhash and expand it using the generic hash API
James Almer [Wed, 15 May 2013 22:18:25 +0000 (19:18 -0300)]
Rename ffadler to ffhash and expand it using the generic hash API

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 16 May 2013 15:10:51 +0000 (17:10 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sparc: Eliminate dead code in VIS acceleration macros
  flacdec: drop unnecessary assert
  mjpegdec: properly report unsupported disabled features

Conflicts:
libavcodec/flacdec.c
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 16 May 2013 15:00:10 +0000 (17:00 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_pad: use the name 's' for the pointer to the private context
  vf_overlay: use the name 's' for the pointer to the private context
  vf_lut: use the name 's' for the pointer to the private context

Conflicts:
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8'
Michael Niedermayer [Thu, 16 May 2013 14:36:59 +0000 (16:36 +0200)]
Merge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8'

* commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8':
  vf_libopencv: use the name 's' for the pointer to the private context
  vf_hqdn3d: use the name 's' for the pointer to the private context
  vf_hflip: use the name 's' for the pointer to the private context
  vf_gradfun: use the name 's' for the pointer to the private context

Conflicts:
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'
Michael Niedermayer [Thu, 16 May 2013 13:21:31 +0000 (15:21 +0200)]
Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'

* commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8':
  vf_frei0r: use the name 's' for the pointer to the private context
  vf_format: use the name 's' for the pointer to the private context
  vf_fieldorder: use the name 's' for the pointer to the private context
  vf_fieldorder: cosmetics, remove an extra linebreak

Conflicts:
libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosparc: Eliminate dead code in VIS acceleration macros
Michael Kostylev [Wed, 15 May 2013 00:25:30 +0000 (20:25 -0400)]
sparc: Eliminate dead code in VIS acceleration macros

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoflacdec: drop unnecessary assert
Luca Barbato [Wed, 15 May 2013 16:16:18 +0000 (18:16 +0200)]
flacdec: drop unnecessary assert

The condition cannot happen anymore.

6 years agomjpegdec: properly report unsupported disabled features
Luca Barbato [Tue, 14 May 2013 13:27:26 +0000 (15:27 +0200)]
mjpegdec: properly report unsupported disabled features

When JPEG-LS support is disabled the decoder would feed the
data to the JPEG Lossless decode_*_scan function resulting in
faulty decoding.

CC: libav-stable@libav.org
6 years agolavfi/unsharp: remove unused float.h include.
Clément Bœsch [Thu, 16 May 2013 11:38:26 +0000 (13:38 +0200)]
lavfi/unsharp: remove unused float.h include.

6 years agolavfi/unsharp: use av_image_copy_plane().
Clément Bœsch [Thu, 16 May 2013 11:36:42 +0000 (13:36 +0200)]
lavfi/unsharp: use av_image_copy_plane().

6 years agofate/colorchannelmixer: make sure direct path is tested.
Clément Bœsch [Wed, 15 May 2013 23:23:55 +0000 (01:23 +0200)]
fate/colorchannelmixer: make sure direct path is tested.

6 years agoMerge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'
Michael Niedermayer [Thu, 16 May 2013 08:33:31 +0000 (10:33 +0200)]
Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'

* commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68':
  vf_fade: use the name 's' for the pointer to the private context
  vf_drawtext: use the name 's' for the pointer to the private context
  vf_drawbox: use the name 's' for the pointer to the private context

Conflicts:
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>