ffmpeg.git
7 years agotools: Add adler32 checksum tool
Michael Niedermayer [Wed, 8 May 2013 13:35:01 +0000 (15:35 +0200)]
tools: Add adler32 checksum tool

This is about 6 times faster than md5sum on linux

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add test for lut filter
Paul B Mahol [Wed, 8 May 2013 09:04:16 +0000 (09:04 +0000)]
fate: add test for lut filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 9 May 2013 09:55:40 +0000 (11:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Remove unused argument from QPEL_OP macro

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

* commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e':
  x86: vf_yadif: Remove stray dsputil_mmx #include

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

* commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2':
  x86: dsputil: Move TRANSPOSE4 macro to the only place it is used

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

* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57':
  x86: dsputil: Move constant declarations into separate header

Conflicts:
libavcodec/x86/dsputil_mmx.c

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

* commit 'ed880050edf061b38d3e39e25657c59ad9108b27':
  x86: dsputil: Group all assembly constants together in constants.c

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

* commit '87614667606b42476f9017d79faf12b45a0bd77c':
  x86: dsputil: Move ff_pd assembly constants to the only place they are used

Conflicts:
libavcodec/x86/lpc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: fix 2 warnings about discarding const
Michael Niedermayer [Wed, 8 May 2013 21:53:31 +0000 (23:53 +0200)]
avfilter: fix 2 warnings about discarding const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: add -apad option which injects a apad filter only in the presence of video...
Michael Niedermayer [Wed, 8 May 2013 21:43:19 +0000 (23:43 +0200)]
ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: use av_freep() for forced_kf_pts
Michael Niedermayer [Wed, 8 May 2013 21:42:23 +0000 (23:42 +0200)]
ffmpeg: use av_freep() for forced_kf_pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE
Michael Niedermayer [Wed, 8 May 2013 19:59:28 +0000 (21:59 +0200)]
avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: Make enabled/disabled state available as a field of the AVFilterContext
Michael Niedermayer [Wed, 8 May 2013 19:58:40 +0000 (21:58 +0200)]
avfilter: Make enabled/disabled state available as a field of the AVFilterContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/extractplanes: packed rgb support
Paul B Mahol [Wed, 8 May 2013 18:24:39 +0000 (18:24 +0000)]
lavfi/extractplanes: packed rgb support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/colorchannelmixer: remove now redudant code
Paul B Mahol [Wed, 8 May 2013 18:52:36 +0000 (18:52 +0000)]
lavfi/colorchannelmixer: remove now redudant code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/drawutils: add 16 bit rgb and planar rgb to ff_fill_rgba_map()
Paul B Mahol [Wed, 8 May 2013 18:49:55 +0000 (18:49 +0000)]
lavfi/drawutils: add 16 bit rgb and planar rgb to ff_fill_rgba_map()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agox86: dsputil: Remove unused argument from QPEL_OP macro
Diego Biurrun [Tue, 7 May 2013 23:55:21 +0000 (01:55 +0200)]
x86: dsputil: Remove unused argument from QPEL_OP macro

7 years agox86: vf_yadif: Remove stray dsputil_mmx #include
Diego Biurrun [Tue, 7 May 2013 23:51:31 +0000 (01:51 +0200)]
x86: vf_yadif: Remove stray dsputil_mmx #include

7 years agox86: dsputil: Move TRANSPOSE4 macro to the only place it is used
Diego Biurrun [Tue, 7 May 2013 22:57:57 +0000 (00:57 +0200)]
x86: dsputil: Move TRANSPOSE4 macro to the only place it is used

7 years agox86: dsputil: Move constant declarations into separate header
Diego Biurrun [Tue, 7 May 2013 22:50:17 +0000 (00:50 +0200)]
x86: dsputil: Move constant declarations into separate header

7 years agolavfi/null: remove redudant lines
Paul B Mahol [Tue, 7 May 2013 14:58:40 +0000 (14:58 +0000)]
lavfi/null: remove redudant lines

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibswscale: simplify isAnyRGB macro
Paul B Mahol [Tue, 7 May 2013 16:13:06 +0000 (16:13 +0000)]
libswscale: simplify isAnyRGB macro

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/lut: add support for YUVA422P and YUVA444P
Paul B Mahol [Tue, 7 May 2013 12:44:46 +0000 (12:44 +0000)]
lavfi/lut: add support for YUVA422P and YUVA444P

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi: add gbrap support to some filters
Paul B Mahol [Mon, 6 May 2013 15:36:20 +0000 (15:36 +0000)]
lavfi: add gbrap support to some filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibswscale: GBRAP input & output and GBRAP16 input support
Paul B Mahol [Mon, 6 May 2013 15:13:53 +0000 (15:13 +0000)]
libswscale: GBRAP input & output and GBRAP16 input support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 8 May 2013 12:32:43 +0000 (14:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  msvc: Move linker pragma from config.h to libavutil/internal.h

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'
Michael Niedermayer [Wed, 8 May 2013 12:21:39 +0000 (14:21 +0200)]
Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'

* commit 'bd392785a75d7d51414a9788d50396a8d9f29d77':
  fate-run: Drop unnecessary regtest() indirection

Conflicts:
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917'
Michael Niedermayer [Wed, 8 May 2013 12:13:43 +0000 (14:13 +0200)]
Merge commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917'

* commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917':
  x86: dsputil: Remove unused ff_pb_3F constant
  x86: dsputil: Remove unused MOVQ_BONE macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'
Michael Niedermayer [Wed, 8 May 2013 12:08:00 +0000 (14:08 +0200)]
Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'

* commit '63bac48f734fc69cca2ef2cfada92cd9a222734d':
  x86: dsputil: Move rv40-specific functions where they belong

Conflicts:
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'
Michael Niedermayer [Wed, 8 May 2013 12:01:06 +0000 (14:01 +0200)]
Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

* commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2':
  x86: dsputil hpeldsp: Move shared template functions into separate object

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'
Michael Niedermayer [Wed, 8 May 2013 11:55:23 +0000 (13:55 +0200)]
Merge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'

* commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087':
  x86: rnd_template: Eliminate pointless OP_AVG macro indirection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'
Michael Niedermayer [Wed, 8 May 2013 11:41:40 +0000 (13:41 +0200)]
Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'

* commit 'db9aee6ccf183508835acc325f5ad87d595eacc4':
  oma: properly forward errors in oma_read_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0'
Michael Niedermayer [Wed, 8 May 2013 11:37:21 +0000 (13:37 +0200)]
Merge commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0'

* commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0':
  oma: return meaningful errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9'
Michael Niedermayer [Wed, 8 May 2013 11:17:19 +0000 (13:17 +0200)]
Merge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9'

* commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9':
  lavc: do not leak frames in avcodec_decode_audio4

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'
Michael Niedermayer [Wed, 8 May 2013 10:47:54 +0000 (12:47 +0200)]
Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'

* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
  nut: use meaningful error values
  FATE: use a less ambiguous end time for filter-trim-time test

Conflicts:
libavformat/nutdec.c
tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: use shorter variable name for "libavdevice_pc_deps"
Michael Niedermayer [Wed, 8 May 2013 10:38:01 +0000 (12:38 +0200)]
configure: use shorter variable name for "libavdevice_pc_deps"

This is in line with the new name for the libavfilter variable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9779f93066ee5ea6fba6b76f001d358cc2857891'
Michael Niedermayer [Wed, 8 May 2013 10:37:15 +0000 (12:37 +0200)]
Merge commit '9779f93066ee5ea6fba6b76f001d358cc2857891'

* commit '9779f93066ee5ea6fba6b76f001d358cc2857891':
  configure: add dependencies to lavfi .pc file

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'
Michael Niedermayer [Wed, 8 May 2013 10:17:46 +0000 (12:17 +0200)]
Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'

* commit 'bce70f8170592599a4f2f5f02606c1246e88df57':
  configure: make avconv select (a)trim filters

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '481575d255195c6c2f32e04686b94de984ae78d4'
Michael Niedermayer [Wed, 8 May 2013 10:07:56 +0000 (12:07 +0200)]
Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'

* commit '481575d255195c6c2f32e04686b94de984ae78d4':
  avconv: remove -deinterlace

Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.c
ffmpeg_opt.c

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'
Michael Niedermayer [Wed, 8 May 2013 09:54:23 +0000 (11:54 +0200)]
Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'

* commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8':
  indeo3: use unaligned reads on reference blocks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'
Michael Niedermayer [Wed, 8 May 2013 09:46:36 +0000 (11:46 +0200)]
Merge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'

* commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c':
  jpeg2000dec: initialize static data just once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '45a1694fde251ee56e23aec073d73172c00aa470'
Michael Niedermayer [Wed, 8 May 2013 09:41:54 +0000 (11:41 +0200)]
Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'

* commit '45a1694fde251ee56e23aec073d73172c00aa470':
  jpeg2000dec: cleanup properly after decoding errors

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: sbrdsp: force PIC addressing for Win64
Christophe Gisquet [Tue, 7 May 2013 20:35:22 +0000 (20:35 +0000)]
x86: sbrdsp: force PIC addressing for Win64

MSVC complains about the 32bits addressing, while mingw/gcc does not.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/unsharp: use verbal form in help message options
Stefano Sabatini [Sat, 4 May 2013 13:16:11 +0000 (15:16 +0200)]
lavfi/unsharp: use verbal form in help message options

7 years agolavu/mem: fix potential int overflow and crash in av_dynarray_add()
Stefano Sabatini [Wed, 24 Apr 2013 22:27:46 +0000 (00:27 +0200)]
lavu/mem: fix potential int overflow and crash in av_dynarray_add()

Also extend documentation accordingly.

7 years agolavu/mem: extend documentation for av_dynarray_add()
Stefano Sabatini [Wed, 24 Apr 2013 22:06:13 +0000 (00:06 +0200)]
lavu/mem: extend documentation for av_dynarray_add()

In particular, mention the fact that the amortized element addition cost
is constant.

7 years agoavcodec/mpegvideo: Fix edge emu with lowres
Michael Niedermayer [Tue, 7 May 2013 23:18:56 +0000 (01:18 +0200)]
avcodec/mpegvideo: Fix edge emu with lowres

Fixes a few green artifacts at the top
Fixes rest of Ticket 2535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks
Michael Niedermayer [Tue, 7 May 2013 23:17:45 +0000 (01:17 +0200)]
avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks

Fixes green trash
Fixes part of Ticket2535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: dsputil: Group all assembly constants together in constants.c
Diego Biurrun [Mon, 6 May 2013 23:49:02 +0000 (01:49 +0200)]
x86: dsputil: Group all assembly constants together in constants.c

7 years agox86: dsputil: Move ff_pd assembly constants to the only place they are used
Diego Biurrun [Mon, 6 May 2013 23:42:08 +0000 (01:42 +0200)]
x86: dsputil: Move ff_pd assembly constants to the only place they are used

7 years agomsvc: Move linker pragma from config.h to libavutil/internal.h
Martin Storsjö [Mon, 6 May 2013 20:08:41 +0000 (23:08 +0300)]
msvc: Move linker pragma from config.h to libavutil/internal.h

This makes linking succeed for tools that include config.h but
don't link to libavutil.

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

* cigaes/master:
  lavfi: add comments to explain the negotiation loop.
  lavfi: fix filter format negotiation loop.
  ffmpeg: move a local variable definition later.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/vqf: check number of channels before use.
Michael Niedermayer [Tue, 7 May 2013 20:26:22 +0000 (22:26 +0200)]
avformat/vqf: check number of channels before use.

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosanm: Check dimensions before use
Michael Niedermayer [Tue, 7 May 2013 19:58:27 +0000 (21:58 +0200)]
sanm: Check dimensions before use

Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/cdgraphics: check buffer size before use
Michael Niedermayer [Tue, 7 May 2013 19:04:33 +0000 (21:04 +0200)]
avcodec/cdgraphics: check buffer size before use

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodxa: check vectors of 2x2 motion blocks
Michael Niedermayer [Tue, 7 May 2013 18:33:33 +0000 (20:33 +0200)]
dxa: check vectors of 2x2 motion blocks

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodxa: check vectors of 4x4 motion blocks
Michael Niedermayer [Tue, 7 May 2013 18:18:41 +0000 (20:18 +0200)]
dxa: check vectors of 4x4 motion blocks

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoshorten: allocate space for padding
Michael Niedermayer [Tue, 7 May 2013 17:57:10 +0000 (19:57 +0200)]
shorten: allocate space for padding

Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate-run: Drop unnecessary regtest() indirection
Diego Biurrun [Mon, 6 May 2013 16:35:34 +0000 (18:35 +0200)]
fate-run: Drop unnecessary regtest() indirection

The indirection was used to abstract from the different -regression.sh
scripts. Now that only one remains, this indirection is pointless.

7 years agolavfi: add comments to explain the negotiation loop.
Nicolas George [Mon, 6 May 2013 12:09:53 +0000 (14:09 +0200)]
lavfi: add comments to explain the negotiation loop.

7 years agolavfi: fix filter format negotiation loop.
Nicolas George [Mon, 6 May 2013 11:46:23 +0000 (13:46 +0200)]
lavfi: fix filter format negotiation loop.

query_formats() returning EAGAIN is not considered a progress
in the format negotiation.

If the filter returns EAGAIN but did set some of its formats
lists, it could be considered a partial success and counted
as progress in the negotiation. Not counting it is not a
problem because it currently only happens in the first round,
where there will always be some progress on the other filters.

7 years agoffmpeg: move a local variable definition later.
Nicolas George [Mon, 6 May 2013 21:51:27 +0000 (23:51 +0200)]
ffmpeg: move a local variable definition later.

Fix a segfault when using the -map option without input files.

7 years agox86: dsputil: Remove unused ff_pb_3F constant
Diego Biurrun [Mon, 6 May 2013 23:37:03 +0000 (01:37 +0200)]
x86: dsputil: Remove unused ff_pb_3F constant

7 years agox86: dsputil: Move rv40-specific functions where they belong
Diego Biurrun [Sat, 27 Apr 2013 19:30:06 +0000 (21:30 +0200)]
x86: dsputil: Move rv40-specific functions where they belong

7 years agox86: dsputil: Remove unused MOVQ_BONE macro
Diego Biurrun [Mon, 6 May 2013 23:34:53 +0000 (01:34 +0200)]
x86: dsputil: Remove unused MOVQ_BONE macro

7 years agox86: dsputil hpeldsp: Move shared template functions into separate object
Diego Biurrun [Mon, 6 May 2013 22:42:22 +0000 (00:42 +0200)]
x86: dsputil hpeldsp: Move shared template functions into separate object

7 years agox86: rnd_template: Eliminate pointless OP_AVG macro indirection
Diego Biurrun [Mon, 6 May 2013 22:15:41 +0000 (00:15 +0200)]
x86: rnd_template: Eliminate pointless OP_AVG macro indirection

7 years agogifdec: reset previous Graphic Control Extension disposal type
Michael Niedermayer [Tue, 7 May 2013 14:07:27 +0000 (16:07 +0200)]
gifdec: reset previous Graphic Control Extension disposal type

This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/overlay: reindent fix.
Clément Bœsch [Wed, 1 May 2013 12:34:21 +0000 (14:34 +0200)]
lavfi/overlay: reindent fix.

7 years agolavfi/alphaextract: copy width and not linesize.
Clément Bœsch [Wed, 1 May 2013 12:27:23 +0000 (14:27 +0200)]
lavfi/alphaextract: copy width and not linesize.

Padding data is not supposed to be copied.

7 years agosws: factorize rgb 9+ planar funcs declarations.
Clément Bœsch [Sun, 21 Apr 2013 20:31:36 +0000 (22:31 +0200)]
sws: factorize rgb 9+ planar funcs declarations.

7 years agooma: properly forward errors in oma_read_packet
Luca Barbato [Tue, 7 May 2013 07:39:10 +0000 (09:39 +0200)]
oma: properly forward errors in oma_read_packet

Prevent spurios EIO on EOF.

CC:libav-stable@libav.org

7 years agooma: return meaningful errors
Luca Barbato [Wed, 17 Apr 2013 09:41:54 +0000 (11:41 +0200)]
oma: return meaningful errors

7 years agolavc: do not leak frames in avcodec_decode_audio4
Luca Barbato [Tue, 7 May 2013 00:02:51 +0000 (02:02 +0200)]
lavc: do not leak frames in avcodec_decode_audio4

Notwithstanding the return value the frame should be freed if
is not going to be used.

Reported-by: Matthew Wolenetz <wolenetz@chromium.org>
7 years agonut: use meaningful error values
Luca Barbato [Mon, 6 May 2013 09:39:30 +0000 (11:39 +0200)]
nut: use meaningful error values

Fix the mispresented EINVAL for EOF on partial files, among the other.

7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 7 May 2013 12:21:45 +0000 (14:21 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoTicket #2540 Enable threading when using -c:v libx264rgb
Gunther Piez [Tue, 7 May 2013 09:32:15 +0000 (11:32 +0200)]
Ticket #2540 Enable threading when using -c:v libx264rgb

Signed-off-by: Gunther Piez <gupiez@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/av_pix_fmt_swap_endianness: simplify and fix code
Michael Niedermayer [Tue, 7 May 2013 10:59:20 +0000 (12:59 +0200)]
avutil/av_pix_fmt_swap_endianness: simplify and fix code

This makes the code also more robust, not having a hard-coded
table that can become (and was) incomplete.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFATE: use a less ambiguous end time for filter-trim-time test
Anton Khirnov [Sun, 5 May 2013 05:59:46 +0000 (07:59 +0200)]
FATE: use a less ambiguous end time for filter-trim-time test

0.1 seconds at 25 fps is exactly 2.5 frames, which may be rounded either
to 2 or 3 on different platforms.

7 years agoconfigure: add dependencies to lavfi .pc file
Anton Khirnov [Sun, 5 May 2013 05:51:58 +0000 (07:51 +0200)]
configure: add dependencies to lavfi .pc file

The scale filter depends on sws, resample on lavr, and movie on lavf and
lavc.

Fixes Bug 502.

7 years agoconfigure: make avconv select (a)trim filters
Anton Khirnov [Sun, 5 May 2013 05:25:22 +0000 (07:25 +0200)]
configure: make avconv select (a)trim filters

They are now used for -ss/-t

7 years agoavconv: remove -deinterlace
Anton Khirnov [Sat, 4 May 2013 12:15:06 +0000 (14:15 +0200)]
avconv: remove -deinterlace

It is incompatible with refcounted frames and since it's been deprecated
for a long time now, fixing it is not worth the effort.

7 years agoindeo3: use unaligned reads on reference blocks.
Anton Khirnov [Sat, 4 May 2013 07:51:17 +0000 (09:51 +0200)]
indeo3: use unaligned reads on reference blocks.

They are not guaranteed to be aligned.
Fixes Bug 503.

CC:libav-stable@libav.org

7 years agoSupport decoding of Lagarith frame type FRAME_SOLID_COLOR.
Carl Eugen Hoyos [Mon, 6 May 2013 20:40:38 +0000 (22:40 +0200)]
Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

Fixes bug 459.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 7 May 2013 09:33:28 +0000 (11:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate-jpeg2000-dcinema: force output to xyz12le

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
Michael Niedermayer [Tue, 7 May 2013 09:23:55 +0000 (11:23 +0200)]
Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'

* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'
Michael Niedermayer [Tue, 7 May 2013 09:13:46 +0000 (11:13 +0200)]
Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'
Michael Niedermayer [Tue, 7 May 2013 08:59:26 +0000 (10:59 +0200)]
Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
  swscale: add support for endianness only conversion

Conflicts:
libswscale/utils.c
libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '74652af821d7e526a6541876a637fbf81261fa8e'
Michael Niedermayer [Tue, 7 May 2013 08:47:25 +0000 (10:47 +0200)]
Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'

* commit '74652af821d7e526a6541876a637fbf81261fa8e':
  pixdesc: add function to return pixel format with swapped endiannes

Conflicts:
libavutil/pixdesc.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd FATE test for matroska error recovery.
Reimar Döffinger [Sun, 5 May 2013 07:53:58 +0000 (09:53 +0200)]
Add FATE test for matroska error recovery.

This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agomatroska: set "done" only during resync fail.
Reimar Döffinger [Sun, 5 May 2013 07:46:37 +0000 (09:46 +0200)]
matroska: set "done" only during resync fail.

Fixes playback of test7.mkv validation test file.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoavcodec/utils: Fix leak by dereferencing audio frame when side data causes whole...
Matt Wolenetz [Mon, 6 May 2013 21:44:17 +0000 (14:44 -0700)]
avcodec/utils: Fix leak by dereferencing audio frame when side data causes whole frame skip

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()
Michael Niedermayer [Mon, 6 May 2013 20:06:15 +0000 (22:06 +0200)]
jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/mpsub: remove sscanf from probing.
Clément Bœsch [Mon, 6 May 2013 20:48:36 +0000 (22:48 +0200)]
lavf/mpsub: remove sscanf from probing.

This should make probing faster.

7 years agojpeg2000dec: initialize static data just once
Janne Grunau [Mon, 6 May 2013 20:42:27 +0000 (22:42 +0200)]
jpeg2000dec: initialize static data just once

7 years agojpeg2000dec: cleanup properly after decoding errors
Janne Grunau [Mon, 6 May 2013 20:27:33 +0000 (22:27 +0200)]
jpeg2000dec: cleanup properly after decoding errors

Fixes memory leak in fate-redcode-demux.

7 years agoCosmetics: Fix indentation and add braces after last commit.
Carl Eugen Hoyos [Mon, 6 May 2013 19:31:36 +0000 (21:31 +0200)]
Cosmetics: Fix indentation and add braces after last commit.

7 years agovc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.
Carl Eugen Hoyos [Mon, 6 May 2013 19:28:59 +0000 (21:28 +0200)]
vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.

Fixes mplayer -vc ffvc1vdpau for interlaced streams.

7 years agoFix vdpau vc1 interlace modes also when using decoder vc1_vdpau.
Rainer Hochecker [Mon, 6 May 2013 19:27:59 +0000 (21:27 +0200)]
Fix vdpau vc1 interlace modes also when using decoder vc1_vdpau.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
7 years agofate-jpeg2000-dcinema: force output to xyz12le
Janne Grunau [Mon, 22 Apr 2013 14:19:37 +0000 (16:19 +0200)]
fate-jpeg2000-dcinema: force output to xyz12le

Fixes Fate tests on big-endian configs.