ffmpeg.git
8 years agoRSD demuxer
James Almer [Fri, 10 May 2013 19:52:10 +0000 (16:52 -0300)]
RSD demuxer

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoadpcm_thp: Allow the use of extradata for the adpcm table
James Almer [Fri, 10 May 2013 18:42:40 +0000 (15:42 -0300)]
adpcm_thp: Allow the use of extradata for the adpcm table

There are several containers that support adpcm_thp (Also known as Gamecube DSP)
streams, but only thp files contain the coeff table and previous sample inside
each frame.
Some don't even contain previous sample information at all.

This change will make it easier to implement demuxers for said containers
without having to create a new decoder.

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoADP demuxer
James Almer [Fri, 3 May 2013 21:08:05 +0000 (18:08 -0300)]
ADP demuxer

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoADPCM DTK decoder
James Almer [Fri, 3 May 2013 21:07:13 +0000 (18:07 -0300)]
ADPCM DTK decoder

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agosws: add casts to silence pointer type mismatch warnings
Michael Niedermayer [Fri, 10 May 2013 18:35:49 +0000 (20:35 +0200)]
sws: add casts to silence pointer type mismatch warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws/output/yuv2gbrp_full_X_c(): silence warning about uninitialized variable
Michael Niedermayer [Fri, 10 May 2013 18:33:04 +0000 (20:33 +0200)]
sws/output/yuv2gbrp_full_X_c(): silence warning about uninitialized variable

clang did not show this one, so i missed it in the last batch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/select: set forgotten VAR_PICT_TYPE_BI
Paul B Mahol [Fri, 10 May 2013 17:37:50 +0000 (17:37 +0000)]
lavfi/select: set forgotten VAR_PICT_TYPE_BI

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi: avectorscope filter
Paul B Mahol [Thu, 21 Feb 2013 10:32:59 +0000 (10:32 +0000)]
lavfi: avectorscope filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi: use ceil right shift for chroma width/height.
Clément Bœsch [Thu, 9 May 2013 15:59:38 +0000 (17:59 +0200)]
lavfi: use ceil right shift for chroma width/height.

This should fix several issues with odd dimensions inputs.

lut, vflip, pad and crop video filters also need to be checked for such
issues. It's possible sws is also affected.

8 years agolavfi/anull: remove redundant lines
Paul B Mahol [Fri, 10 May 2013 09:11:51 +0000 (09:11 +0000)]
lavfi/anull: remove redundant lines

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavidec: Enable full parsing for potencoder mpeg1/2
Michael Niedermayer [Fri, 10 May 2013 14:55:06 +0000 (16:55 +0200)]
avidec: Enable full parsing for potencoder mpeg1/2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: modify names of deshake_kernel.h and unsharp_kernel.h
highgod0401 [Wed, 8 May 2013 00:53:09 +0000 (08:53 +0800)]
lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix configure --help output for some autodetected features.
Carl Eugen Hoyos [Fri, 10 May 2013 07:55:15 +0000 (09:55 +0200)]
Fix configure --help output for some autodetected features.

8 years agolavfi/avfiltergraph: fix style
Stefano Sabatini [Fri, 10 May 2013 08:16:47 +0000 (10:16 +0200)]
lavfi/avfiltergraph: fix style

8 years agolavfi/avfilter.h: fix typo
Stefano Sabatini [Fri, 10 May 2013 08:16:09 +0000 (10:16 +0200)]
lavfi/avfilter.h: fix typo

8 years agolavu/mem.h: fix typo
Stefano Sabatini [Fri, 10 May 2013 07:15:06 +0000 (09:15 +0200)]
lavu/mem.h: fix typo

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 May 2013 07:35:33 +0000 (09:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mmf: K&R formatting cosmetics

Conflicts:
libavformat/mmf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomimic: Fix race condition
Michael Niedermayer [Thu, 9 May 2013 23:18:12 +0000 (01:18 +0200)]
mimic: Fix race condition

Fixes access after free.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws/output: silence warnings about uninitialized use of variables
Michael Niedermayer [Thu, 9 May 2013 22:48:37 +0000 (00:48 +0200)]
sws/output: silence warnings about uninitialized use of variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotakdec: simplify use of scalarproduct_int16 in decode_subframe()
Paul B Mahol [Thu, 9 May 2013 09:59:38 +0000 (09:59 +0000)]
takdec: simplify use of scalarproduct_int16 in decode_subframe()

Makes decoding little faster.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoAdd fate test for solid colour lagarith frames.
Carl Eugen Hoyos [Tue, 7 May 2013 15:46:26 +0000 (17:46 +0200)]
Add fate test for solid colour lagarith frames.

8 years agolavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.
Clément Bœsch [Tue, 7 May 2013 14:37:27 +0000 (16:37 +0200)]
lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.

8 years agolavfi/overlay: simpler up-rounded w/h computations.
Clément Bœsch [Wed, 1 May 2013 12:46:00 +0000 (14:46 +0200)]
lavfi/overlay: simpler up-rounded w/h computations.

8 years agolavu: add FF_CEIL_RSHIFT and use it in various places.
Clément Bœsch [Tue, 7 May 2013 14:31:02 +0000 (16:31 +0200)]
lavu: add FF_CEIL_RSHIFT and use it in various places.

8 years agoffadler: fix duplicate \n on errors
Michael Niedermayer [Thu, 9 May 2013 14:34:55 +0000 (16:34 +0200)]
ffadler: fix duplicate \n on errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: remove alphaextract special code
Paul B Mahol [Wed, 8 May 2013 19:48:09 +0000 (19:48 +0000)]
lavfi: remove alphaextract special code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoffadler: add multifile support
Michael Niedermayer [Wed, 8 May 2013 16:11:50 +0000 (18:11 +0200)]
ffadler: add multifile support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 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>
8 years agommf: K&R formatting cosmetics
Luca Barbato [Thu, 9 May 2013 08:37:31 +0000 (10:37 +0200)]
mmf: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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

8 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

8 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

8 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

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

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

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

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

8 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

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

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

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

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

8 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

8 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

8 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

8 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

8 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

8 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>
8 years agolavfi/overlay: reindent fix.
Clément Bœsch [Wed, 1 May 2013 12:34:21 +0000 (14:34 +0200)]
lavfi/overlay: reindent fix.

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

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

8 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