ffmpeg.git
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 years agopthread: reindent
Anton Khirnov [Sat, 11 May 2013 15:32:52 +0000 (17:32 +0200)]
pthread: reindent

7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

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

7 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.

7 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

7 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

7 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>
7 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>
7 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>
7 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>
7 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().

7 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.

7 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.

7 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.

7 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>
7 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>
7 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.

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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.

7 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
7 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.

7 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().

7 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.

7 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>
7 years agoMerge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'
Michael Niedermayer [Thu, 16 May 2013 08:14:00 +0000 (10:14 +0200)]
Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'

* commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd':
  vf_delogo: use the name 's' for the pointer to the private context
  vf_cropdetect: use the name 's' for the pointer to the private context
  vf_crop: cosmetics, break lines

Conflicts:
libavfilter/vf_delogo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7f83959598b6565baa0091e5739dd9091ab7a990'
Michael Niedermayer [Thu, 16 May 2013 08:08:17 +0000 (10:08 +0200)]
Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990'

* commit '7f83959598b6565baa0091e5739dd9091ab7a990':
  vf_crop: use the name 's' for the pointer to the private context
  vf_boxblur: use the name 's' for the pointer to the private context
  vf_blackframe: use the name 's' for the pointer to the private context

Conflicts:
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_crop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
Michael Niedermayer [Thu, 16 May 2013 07:55:22 +0000 (09:55 +0200)]
Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
libavcodec/4xm.c
libavcodec/dvdsubdec.c
libavcodec/ituh263dec.c
libavcodec/mpeg12.c
libavfilter/avfilter.c
libavfilter/vf_aspect.c
libavfilter/vf_fieldorder.c
libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'
Michael Niedermayer [Thu, 16 May 2013 07:46:19 +0000 (09:46 +0200)]
Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'

* commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec':
  jpegls: K&R formatting cosmetics

Conflicts:
libavcodec/jpegls.c
libavcodec/jpegls.h
libavcodec/jpeglsdec.c
libavcodec/jpeglsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'
Michael Niedermayer [Thu, 16 May 2013 07:19:11 +0000 (09:19 +0200)]
Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'

* commit '9cacdabd1c8cd257a942d8289349c37d992989b7':
  jpegls: cosmetics: Drop some unnecessary parentheses
  mpegvideo: Remove commented-out PARANOID debug cruft

Conflicts:
libavcodec/jpegls.c
libavcodec/mpegvideo.c
libavcodec/x86/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'
Michael Niedermayer [Thu, 16 May 2013 07:11:04 +0000 (09:11 +0200)]
Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'

* commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d':
  Remove commented-out #includes
  h263dec: Remove broken and disabled debug cruft
  vc1: Reindent INIT_LUT(), align backslashes

Conflicts:
libavcodec/vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_pad: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_pad: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_overlay: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_overlay: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_lut: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_lut: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_libopencv: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_libopencv: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_hqdn3d: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_hqdn3d: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_hflip: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_hflip: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_gradfun: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_gradfun: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_frei0r: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_frei0r: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_format: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_format: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_fieldorder: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_fieldorder: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_fieldorder: cosmetics, remove an extra linebreak
Anton Khirnov [Mon, 18 Mar 2013 21:26:49 +0000 (22:26 +0100)]
vf_fieldorder: cosmetics, remove an extra linebreak

7 years agovf_fade: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_fade: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_drawtext: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_drawtext: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_drawbox: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_drawbox: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_delogo: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_delogo: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_cropdetect: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_cropdetect: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_crop: cosmetics, break lines
Anton Khirnov [Mon, 18 Mar 2013 20:48:18 +0000 (21:48 +0100)]
vf_crop: cosmetics, break lines

7 years agovf_crop: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_crop: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_boxblur: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_boxblur: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_blackframe: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_blackframe: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agovf_aspect: use the name 's' for the pointer to the private context
Anton Khirnov [Mon, 18 Mar 2013 19:44:36 +0000 (20:44 +0100)]
vf_aspect: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.

7 years agolavfi/mp: remove mp=ow wrapper.
Clément Bœsch [Wed, 15 May 2013 22:44:37 +0000 (00:44 +0200)]
lavfi/mp: remove mp=ow wrapper.

Filter ported natively as owdenoise.

7 years agolavfi: port wavelet denoiser filter from libmpcodecs.
Clément Bœsch [Fri, 10 May 2013 19:27:15 +0000 (21:27 +0200)]
lavfi: port wavelet denoiser filter from libmpcodecs.

7 years agoRemove commented-out debug #define cruft
Diego Biurrun [Wed, 15 May 2013 13:16:12 +0000 (15:16 +0200)]
Remove commented-out debug #define cruft

7 years agojpegls: K&R formatting cosmetics
Luca Barbato [Wed, 15 May 2013 17:03:53 +0000 (19:03 +0200)]
jpegls: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agojpegls: cosmetics: Drop some unnecessary parentheses
Diego Biurrun [Wed, 15 May 2013 17:55:09 +0000 (19:55 +0200)]
jpegls: cosmetics: Drop some unnecessary parentheses

7 years agompegvideo: Remove commented-out PARANOID debug cruft
Diego Biurrun [Wed, 15 May 2013 13:17:08 +0000 (15:17 +0200)]
mpegvideo: Remove commented-out PARANOID debug cruft

7 years agolavu/hash: Fix CRC32 calculation
James Almer [Wed, 15 May 2013 21:36:40 +0000 (18:36 -0300)]
lavu/hash: Fix CRC32 calculation

Initialize it with UINT32_MAX and xor the result with UINT32_MAX
as well.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/hash: Fix adler32 calculation
James Almer [Wed, 15 May 2013 21:34:58 +0000 (18:34 -0300)]
lavu/hash: Fix adler32 calculation

Adler must be initialized with a non zero value.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRemove commented-out #includes
Diego Biurrun [Wed, 15 May 2013 13:09:20 +0000 (15:09 +0200)]
Remove commented-out #includes

7 years agoh263dec: Remove broken and disabled debug cruft
Diego Biurrun [Wed, 15 May 2013 12:49:31 +0000 (14:49 +0200)]
h263dec: Remove broken and disabled debug cruft