ffmpeg.git
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 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>
6 years agotools: add zmqsend tool, useful to test the zmq filters
Stefano Sabatini [Fri, 3 May 2013 16:05:18 +0000 (18:05 +0200)]
tools: add zmqsend tool, useful to test the zmq filters

6 years agolavfi: add zmq filters
Stefano Sabatini [Sun, 21 Apr 2013 13:00:11 +0000 (15:00 +0200)]
lavfi: add zmq filters

6 years agolavu/hash: Fix name of SHA224
James Almer [Tue, 14 May 2013 01:32:00 +0000 (22:32 -0300)]
lavu/hash: Fix name of SHA224

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/blend: timeline support
Paul B Mahol [Tue, 14 May 2013 17:41:50 +0000 (17:41 +0000)]
lavfi/blend: timeline support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoswscale/output: silence compiler warnings about uninitialized variables
Michael Niedermayer [Tue, 14 May 2013 16:48:54 +0000 (18:48 +0200)]
swscale/output: silence compiler warnings about uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: update the mmf reference
Luca Barbato [Tue, 14 May 2013 16:03:43 +0000 (18:03 +0200)]
fate: update the mmf reference

Using Optional Data chunk introduced changes the hash.

6 years agodoc/outdevs: fix typos (devices -> device)
Stefano Sabatini [Tue, 14 May 2013 12:26:47 +0000 (14:26 +0200)]
doc/outdevs: fix typos (devices -> device)

6 years agolavfi: cosmetics: fix vertical alignment for pads in some filters
Paul B Mahol [Tue, 14 May 2013 15:27:25 +0000 (15:27 +0000)]
lavfi: cosmetics: fix vertical alignment for pads in some filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agommf: Write metadata into an Optional Data chunk
Yoshihisa Uchida [Sat, 5 Jan 2013 22:11:09 +0000 (23:11 +0100)]
mmf: Write metadata into an Optional Data chunk

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000dec: Use correct printf length modifier for pointer differences
Diego Biurrun [Mon, 13 May 2013 19:40:53 +0000 (21:40 +0200)]
jpeg2000dec: Use correct printf length modifier for pointer differences

Also eliminate an unnecessary cast. Fixes the following warning:
jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’

6 years agoavformat/srtdec: Fix pointer corruption
Michael Niedermayer [Tue, 14 May 2013 14:18:40 +0000 (16:18 +0200)]
avformat/srtdec: Fix pointer corruption

This fixes use of uninitialized memory and possible out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: Don't apply the loop filter on fields
Martin Storsjö [Tue, 14 May 2013 11:36:00 +0000 (14:36 +0300)]
vc1dec: Don't apply the loop filter on fields

Fixes read of uninitialized memory.

Based on a patch by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovf_colorchannelmixer: round lut entries to nearest
Michael Niedermayer [Tue, 14 May 2013 10:49:48 +0000 (12:49 +0200)]
vf_colorchannelmixer: round lut entries to nearest

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: change colorchannelmixers coefficients to be less unstable
Michael Niedermayer [Tue, 14 May 2013 10:43:22 +0000 (12:43 +0200)]
fate: change colorchannelmixers coefficients to be less unstable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: implement frame interlaced b-frame header parsing
Hendrik Leppkes [Mon, 23 Jan 2012 21:17:46 +0000 (22:17 +0100)]
vc1: implement frame interlaced b-frame header parsing

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Don't attempt error concealment on field pictures
Michael Niedermayer [Tue, 24 Jul 2012 02:05:18 +0000 (04:05 +0200)]
vc1dec: Don't attempt error concealment on field pictures

This is not implemented and doesn't work.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 14 May 2013 10:21:41 +0000 (12:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Disable PIC for cygwin just as for win32/mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'
Michael Niedermayer [Tue, 14 May 2013 10:01:13 +0000 (12:01 +0200)]
Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

* commit '1399931d07f0f37ef4526eb8d39d33c64e09618a':
  x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: fieldtx is only valid for interlaced frame pictures
Sebastian Sandberg [Thu, 31 Jan 2013 17:04:21 +0000 (18:04 +0100)]
vc1dec: fieldtx is only valid for interlaced frame pictures

The fieldtx_plane is not cleared for interlaced fields.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoaacenc: Fix erasure of surround channels
Claudio Freire [Sun, 12 May 2013 07:38:40 +0000 (09:38 +0200)]
aacenc: Fix erasure of surround channels

This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoaacenc: Fix target bitrate for twoloop quantiser search
Claudio Freire [Sat, 4 May 2013 21:36:37 +0000 (18:36 -0300)]
aacenc: Fix target bitrate for twoloop quantiser search

This fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoaacenc: Fix a rounding bug in aacpsy channel bitrate computation
Claudio Freire [Sat, 4 May 2013 21:35:49 +0000 (18:35 -0300)]
aacenc: Fix a rounding bug in aacpsy channel bitrate computation

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit '245b76a108585b6fb52eebc2626c472d6fa530dc'
Michael Niedermayer [Tue, 14 May 2013 08:55:28 +0000 (10:55 +0200)]
Merge commit '245b76a108585b6fb52eebc2626c472d6fa530dc'

* commit '245b76a108585b6fb52eebc2626c472d6fa530dc':
  x86: dsputil: Split inline assembly from init code

Conflicts:
libavcodec/x86/dsputil_mmx.c

Note, the author attribution is left in place and not removed
as it is in the merged commit.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
Michael Niedermayer [Tue, 14 May 2013 08:18:46 +0000 (10:18 +0200)]
Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'

* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
  x86: dsputil: Refactor pixels16 wrapper functions with a macro

Conflicts:
libavcodec/x86/hpeldsp_avg_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: correct strides in filter_edges_16bit
James Darnley [Fri, 15 Mar 2013 15:37:33 +0000 (16:37 +0100)]
yadif: correct strides in filter_edges_16bit

The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoyadif: restore speed of the C filtering code
James Darnley [Sun, 10 Mar 2013 14:08:50 +0000 (15:08 +0100)]
yadif: restore speed of the C filtering code

Always use the special filter for the first and last 3 columns (only).

Changes made in 64ed397 slowed the filter to just under 3/4 of what it
was.  This commit restores the speed while maintaining identical output.

For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)
Matt Wolenetz [Tue, 14 May 2013 02:29:26 +0000 (19:29 -0700)]
lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)

This fixes https://bugzilla.libav.org/show_bug.cgi?id=514.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc/filters: add some examples for the fps filter
burek [Mon, 13 May 2013 23:42:39 +0000 (01:42 +0200)]
doc/filters: add some examples for the fps filter

Signed-off-by: burek <burek021@gmail.com>
6 years agomd5enc: don't reuse priv_class in two formats
Hendrik Leppkes [Mon, 13 May 2013 21:36:53 +0000 (23:36 +0200)]
md5enc: don't reuse priv_class in two formats

Apparently, this is not allowed and can trip up all sorts of things.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd a generic hash API.
Reimar Döffinger [Thu, 9 May 2013 16:10:47 +0000 (18:10 +0200)]
Add a generic hash API.

Also use this API in framemd5.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoAdd 128 bit murmur3 hash function.
Reimar Döffinger [Thu, 9 May 2013 12:34:46 +0000 (14:34 +0200)]
Add 128 bit murmur3 hash function.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoavfilter: Add 'drawgrid' video filter
Andrey Utkin [Mon, 13 May 2013 18:48:44 +0000 (21:48 +0300)]
avfilter: Add 'drawgrid' video filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Disable PIC for cygwin just as for win32/mingw
Martin Storsjö [Mon, 13 May 2013 09:06:40 +0000 (12:06 +0300)]
configure: Disable PIC for cygwin just as for win32/mingw

If this is explicitly disabled for win32/mingw, it should also
be disabled for cygwin, for consistency and for the same reasons
as for win32/mingw.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoBetter handling for MXF essence reading reaching EOF.
Joseph Artsimovich [Wed, 8 May 2013 12:07:41 +0000 (13:07 +0100)]
Better handling for MXF essence reading reaching EOF.

If no metadata follows MXF essence, that is essence ends with EOF,
"Operation not permitted" error was produced and a non-zero code
was returned from ffmpeg executable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/lcldec: Check that dimensions are a multiple of the subsample factors
Michael Niedermayer [Mon, 13 May 2013 16:09:04 +0000 (18:09 +0200)]
avcodec/lcldec: Check that dimensions are a multiple of the subsample factors

Other dimensions would not work correctly currently,
also ask for a sample for files that fail this check.

This fixes an integer overflow leading to out of array
accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/common: make FF_CEIL_RSHIFT faster when shift is constant.
Clément Bœsch [Sun, 12 May 2013 11:29:23 +0000 (13:29 +0200)]
lavu/common: make FF_CEIL_RSHIFT faster when shift is constant.

See "[PATCH] lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding."
thread for more information.

6 years agofate: fix filter-colorchannelmixer by adding bitexact & accurate flags
Michael Niedermayer [Mon, 13 May 2013 15:11:38 +0000 (17:11 +0200)]
fate: fix filter-colorchannelmixer by adding bitexact & accurate flags

Idea by durandal11707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert: silence "incompatible pointer type" warning
Paul B Mahol [Mon, 13 May 2013 14:41:21 +0000 (14:41 +0000)]
imgconvert: silence "incompatible pointer type" warning

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agocdgraphics: initialize buffer
Michael Niedermayer [Mon, 13 May 2013 12:39:00 +0000 (14:39 +0200)]
cdgraphics: initialize buffer

Prevent use of uninitialized memory

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbisdec: check codebook entry count
Michael Niedermayer [Mon, 13 May 2013 12:19:57 +0000 (14:19 +0200)]
vorbisdec: check codebook entry count

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/ffeval: use av_dynarray2_add()
Stefano Sabatini [Sat, 27 Apr 2013 20:46:49 +0000 (22:46 +0200)]
tools/ffeval: use av_dynarray2_add()

Simplify, increment robustness.

6 years agolavu/mem: add av_dynarray2_add()
Stefano Sabatini [Sun, 14 Apr 2013 01:07:54 +0000 (03:07 +0200)]
lavu/mem: add av_dynarray2_add()

Based on a patch by Clément Bœsch.

See thread:
From: Clément Bœsch <ubitux@gmail.com>
Subject: [FFmpeg-devel] [PATCH 1/5] lavu: add av_dynarray_alloc_elem().
Date: Sun, 14 Apr 2013 03:07:54 +0200

6 years agolavu: define FF_MEMORY_POISON and use it
Stefano Sabatini [Sun, 12 May 2013 11:37:33 +0000 (13:37 +0200)]
lavu: define FF_MEMORY_POISON and use it

Allow single-place definition of constant used to fill poisoned memory.

6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 13 May 2013 11:25:06 +0000 (13:25 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not read strd chunk in avi files as H264 extradata.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add colorchannelmixer test
Paul B Mahol [Mon, 13 May 2013 10:24:16 +0000 (10:24 +0000)]
fate: add colorchannelmixer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoDo not read strd chunk in avi files as H264 extradata.
Carl Eugen Hoyos [Mon, 13 May 2013 10:39:44 +0000 (12:39 +0200)]
Do not read strd chunk in avi files as H264 extradata.

Fixes ticket #2561.

6 years agotests/lavf-regression: fix gbrp10 dpx test on big endian
Paul B Mahol [Mon, 13 May 2013 10:06:35 +0000 (10:06 +0000)]
tests/lavf-regression: fix gbrp10 dpx test on big endian

For some reason only for that pix format decoder picks native format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 13 May 2013 09:36:42 +0000 (11:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: x86: Only enable cpunop on i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'
Michael Niedermayer [Mon, 13 May 2013 09:29:37 +0000 (11:29 +0200)]
Merge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'

* commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199':
  configure: Rename cmov processor capability to i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e08c946c6860a78b0c479551d5f6735361160cbd'
Michael Niedermayer [Mon, 13 May 2013 09:23:11 +0000 (11:23 +0200)]
Merge commit 'e08c946c6860a78b0c479551d5f6735361160cbd'

* commit 'e08c946c6860a78b0c479551d5f6735361160cbd':
  configure: Explicitly disable PIC when targeting win32/mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121'
Michael Niedermayer [Mon, 13 May 2013 08:53:13 +0000 (10:53 +0200)]
Merge commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121'

* commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121':
  configure: Use enable_weak when enabling pic

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopngenc: Add 'dpi', 'dpm' options
Andrey Utkin [Fri, 10 May 2013 15:45:11 +0000 (18:45 +0300)]
pngenc: Add 'dpi', 'dpm' options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: increase coverage for dpx encoder
Paul B Mahol [Sun, 12 May 2013 22:04:26 +0000 (22:04 +0000)]
fate: increase coverage for dpx encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodpxenc: simplifiy code using AVPixFmtDescriptor
Paul B Mahol [Sun, 12 May 2013 21:27:48 +0000 (21:27 +0000)]
dpxenc: simplifiy code using AVPixFmtDescriptor

Update rgb24 fate test as it no longer writes image in big endian
format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodpxenc: do not set coded_frame
Paul B Mahol [Sun, 12 May 2013 21:15:59 +0000 (21:15 +0000)]
dpxenc: do not set coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agox86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h
Diego Biurrun [Tue, 7 May 2013 23:52:57 +0000 (01:52 +0200)]
x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

The header is not (anymore) MMX-specific.

6 years agox86: dsputil: Split inline assembly from init code
Diego Biurrun [Tue, 7 May 2013 23:45:39 +0000 (01:45 +0200)]
x86: dsputil: Split inline assembly from init code

Also remove some pointless comments.

6 years agox86: dsputil: Refactor pixels16 wrapper functions with a macro
Diego Biurrun [Sat, 20 Apr 2013 18:28:28 +0000 (20:28 +0200)]
x86: dsputil: Refactor pixels16 wrapper functions with a macro