ffmpeg.git
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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

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

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

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

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

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

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

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

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

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

6 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

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

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

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

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

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

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

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

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

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

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

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

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

6 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

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

6 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

6 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>
6 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>
6 years agoRemove commented-out #includes
Diego Biurrun [Wed, 15 May 2013 13:09:20 +0000 (15:09 +0200)]
Remove commented-out #includes

6 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

6 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Wed, 15 May 2013 18:22:05 +0000 (20:22 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/concat: reject empty scripts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 15 May 2013 18:09:20 +0000 (20:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Use linker hardening flags on mingw
  vc1: Make INIT_LUT() self contained
  vc1: Simplify code by using INIT_LUT()
  vc1: Move INIT_LUT() further up to allow using it in more places
  vc1dec: Remove some now unused variables
  vc1dec: Do not allow field_mode to change after the first header
  vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header
  vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()
  vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()
  vc1dec: Factorize picture pointer selection code
  vc1dec: Factorize srcU/V offseting
  vc1dec: Fix tff == 0 handling in init_block_index()
  vc1dec: Update destination pointers in context for fields

Conflicts:
libavcodec/vc1.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: Reindent INIT_LUT(), align backslashes
Martin Storsjö [Wed, 15 May 2013 08:56:04 +0000 (11:56 +0300)]
vc1: Reindent INIT_LUT(), align backslashes

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavf/concat: reject empty scripts.
Nicolas George [Wed, 15 May 2013 14:53:35 +0000 (16:53 +0200)]
lavf/concat: reject empty scripts.

Fix trac ticket #2566.

6 years agolavfi/histogram: logarithmic mode for levels
Paul B Mahol [Wed, 15 May 2013 12:36:41 +0000 (12:36 +0000)]
lavfi/histogram: logarithmic mode for levels

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: Use linker hardening flags on mingw
Alex Smith [Tue, 14 May 2013 14:05:52 +0000 (10:05 -0400)]
configure: Use linker hardening flags on mingw

This makes it consistent with the msvc builds which automatically set
the DEP and ASLR flags by default.  There really is no good reason why
they shouldn't be set.

The fact that binutils does not set them on by default boggles the mind.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agowv: make probing more robust
Paul B Mahol [Tue, 14 May 2013 21:03:09 +0000 (21:03 +0000)]
wv: make probing more robust

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodpxenc: dont shift into the sign bit.
Michael Niedermayer [Wed, 15 May 2013 10:15:21 +0000 (12:15 +0200)]
dpxenc: dont shift into the sign bit.

Fixes IOC warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomurmur3: fix memleak
Michael Niedermayer [Wed, 15 May 2013 10:10:09 +0000 (12:10 +0200)]
murmur3: fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: Make INIT_LUT() self contained
Michael Niedermayer [Wed, 24 Apr 2013 13:33:11 +0000 (15:33 +0200)]
vc1: Make INIT_LUT() self contained

Move the local variables it uses into the macro, enclosing them
in a do {} while (0) scope.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 15 May 2013 09:37:51 +0000 (11:37 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Reduce probing score for flic animation files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoreplace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
Michael Niedermayer [Wed, 15 May 2013 09:23:14 +0000 (11:23 +0200)]
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoReduce probing score for flic animation files.
Carl Eugen Hoyos [Wed, 15 May 2013 07:48:06 +0000 (09:48 +0200)]
Reduce probing score for flic animation files.

Fixes ticket #2567.

6 years agovc1: Simplify code by using INIT_LUT()
Michael Niedermayer [Wed, 24 Apr 2013 10:51:28 +0000 (12:51 +0200)]
vc1: Simplify code by using INIT_LUT()

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1: Move INIT_LUT() further up to allow using it in more places
Michael Niedermayer [Wed, 24 Apr 2013 10:51:28 +0000 (12:51 +0200)]
vc1: Move INIT_LUT() further up to allow using it in more places

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Remove some now unused variables
Martin Storsjö [Wed, 15 May 2013 07:32:49 +0000 (10:32 +0300)]
vc1dec: Remove some now unused variables

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Do not allow field_mode to change after the first header
Michael Niedermayer [Thu, 15 Nov 2012 23:48:15 +0000 (00:48 +0100)]
vc1dec: Do not allow field_mode to change after the first header

This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header
Martin Storsjö [Wed, 15 May 2013 08:51:03 +0000 (11:51 +0300)]
vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header

This is required if we return other error codes than explicitly
-1, which so far has been the only other possible return value
besides 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 15 May 2013 08:50:20 +0000 (10:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*

Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()
Michael Niedermayer [Wed, 24 Apr 2013 13:01:08 +0000 (15:01 +0200)]
vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()

No sample tried shows a difference.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()
Michael Niedermayer [Wed, 24 Apr 2013 12:59:49 +0000 (14:59 +0200)]
vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Factorize picture pointer selection code
Michael Niedermayer [Wed, 24 Apr 2013 12:49:31 +0000 (14:49 +0200)]
vc1dec: Factorize picture pointer selection code

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Factorize srcU/V offseting
Michael Niedermayer [Mon, 12 Nov 2012 00:34:44 +0000 (01:34 +0100)]
vc1dec: Factorize srcU/V offseting

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Fix tff == 0 handling in init_block_index()
Michael Niedermayer [Sat, 20 Apr 2013 00:15:13 +0000 (02:15 +0200)]
vc1dec: Fix tff == 0 handling in init_block_index()

This fixes several files from VLC ticket 5887.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a'
Michael Niedermayer [Wed, 15 May 2013 08:38:55 +0000 (10:38 +0200)]
Merge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a'

* commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a':
  jpeg2000dec: don't use deprecated PIX_FMT values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: Update destination pointers in context for fields
Michael Niedermayer [Fri, 1 Feb 2013 18:58:26 +0000 (19:58 +0100)]
vc1dec: Update destination pointers in context for fields

This replaces a large number of checks for the second field by
fixing the pointers when they are setup.

This should also fix I/BI field pictures.

Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs.

Based on "vc1dec: the second field is written wrong to the picture"
by Sebastian Sandberg <sebastiand.sandberg@gmail.com>.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753'
Michael Niedermayer [Wed, 15 May 2013 08:31:30 +0000 (10:31 +0200)]
Merge commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753'

* commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753':
  lavfi: fix compatibility code for old vf_scale options syntax

Conflicts:
libavfilter/avfilter.c

No change as the buggy code does not exist in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'
Michael Niedermayer [Wed, 15 May 2013 08:21:07 +0000 (10:21 +0200)]
Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'

* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
  avfiltergraph: simplify inserting conversion filters.
  Clarify output of av_get_bits_per_pixel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'
Michael Niedermayer [Wed, 15 May 2013 08:15:15 +0000 (10:15 +0200)]
Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'

* commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01':
  fate: update the mmf reference
  mmf: Write metadata into an Optional Data chunk
  jpeg2000dec: Use correct printf length modifier for pointer differences

Conflicts:
libavformat/mmf.c
tests/ref/lavf/mmf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e'
Michael Niedermayer [Wed, 15 May 2013 08:05:40 +0000 (10:05 +0200)]
Merge commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e'

* commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e':
  vc1dec: Don't apply the loop filter on fields

Conflicts:
tests/ref/fate/vc1_sa10143

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'
Michael Niedermayer [Wed, 15 May 2013 07:57:28 +0000 (09:57 +0200)]
Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'

* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5':
  vc1: implement frame interlaced b-frame header parsing

Conflicts:
libavcodec/vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '46430fd47c6239ef8742d0a34f9412d5060fa798'
Michael Niedermayer [Wed, 15 May 2013 07:49:17 +0000 (09:49 +0200)]
Merge commit '46430fd47c6239ef8742d0a34f9412d5060fa798'

* commit '46430fd47c6239ef8742d0a34f9412d5060fa798':
  vc1dec: Don't attempt error concealment on field pictures
  vc1dec: fieldtx is only valid for interlaced frame pictures
  aacenc: Fix erasure of surround channels
  aacenc: Fix target bitrate for twoloop quantiser search

Conflicts:
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76'
Michael Niedermayer [Wed, 15 May 2013 07:45:43 +0000 (09:45 +0200)]
Merge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76'

* commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76':
  aacenc: Fix a rounding bug in aacpsy channel bitrate computation
  yadif: correct strides in filter_edges_16bit
  yadif: restore speed of the C filtering code

Conflicts:
libavfilter/x86/vf_yadif_init.c

No change as these commits where already in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41'
Michael Niedermayer [Wed, 15 May 2013 07:39:01 +0000 (09:39 +0200)]
Merge commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41'

* commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41':
  lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Anton Khirnov [Sun, 12 May 2013 13:41:49 +0000 (15:41 +0200)]
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*

6 years agojpeg2000dec: don't use deprecated PIX_FMT values
Anton Khirnov [Sun, 12 May 2013 13:38:17 +0000 (15:38 +0200)]
jpeg2000dec: don't use deprecated PIX_FMT values

6 years agolavfi: fix compatibility code for old vf_scale options syntax
Anton Khirnov [Tue, 14 May 2013 06:14:21 +0000 (08:14 +0200)]
lavfi: fix compatibility code for old vf_scale options syntax

Currently it would incorrectly trigger on a string that contains a '='
but does not contain a ':', e.g. flags=<flags>.

6 years agoavfiltergraph: simplify inserting conversion filters.
Anton Khirnov [Tue, 14 May 2013 06:16:37 +0000 (08:16 +0200)]
avfiltergraph: simplify inserting conversion filters.

There is now no need to explicitly pass 0:0 as width/height to scale,
those are the defaults.

6 years agoClarify output of av_get_bits_per_pixel
Kieran Kunhya [Tue, 14 May 2013 19:23:40 +0000 (14:23 -0500)]
Clarify output of av_get_bits_per_pixel

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavfi/dctdnoiz: fix 10l typo in pr_height computation.
Clément Bœsch [Wed, 15 May 2013 01:19:49 +0000 (03:19 +0200)]
lavfi/dctdnoiz: fix 10l typo in pr_height computation.

6 years agoffmpeg: free threads on error conditions.
Michael Niedermayer [Tue, 14 May 2013 23:08:18 +0000 (01:08 +0200)]
ffmpeg: free threads on error conditions.

Fixes Ticket2562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add dctdnoiz filter.
Clément Bœsch [Wed, 24 Apr 2013 13:28:53 +0000 (15:28 +0200)]
lavfi: add dctdnoiz filter.

6 years agoavcodec/avpacket: Refactoring copy_side_data into a separate function
Vignesh Venkatasubramanian [Wed, 8 May 2013 23:59:31 +0000 (16:59 -0700)]
avcodec/avpacket: Refactoring copy_side_data into a separate function

Refactoring copy_side_data into a separate function so that it can be called
in cases where side data needs to be duplicated.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx264: zero x264_picture before use.
Michael Niedermayer [Tue, 14 May 2013 20:36:31 +0000 (22:36 +0200)]
libx264: zero x264_picture before use.

This prevents use of uninitialized memory by ffmpeg later
(i_qpplus1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter/Makefile: unbreak make alltools
Michael Niedermayer [Tue, 14 May 2013 19:48:09 +0000 (21:48 +0200)]
libavfilter/Makefile: unbreak make alltools

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