ffmpeg.git
7 years agoffplay: always free buffersink_params in configure_video_filters
Marton Balint [Sun, 28 Oct 2012 00:00:52 +0000 (02:00 +0200)]
ffplay: always free buffersink_params in configure_video_filters

Fixes Coverity CID 733792.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: remove uneeded format filter, buffersink format is set
Marton Balint [Sat, 27 Oct 2012 23:51:25 +0000 (01:51 +0200)]
ffplay: remove uneeded format filter, buffersink format is set

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: check for buffersink_params allocation success
Marton Balint [Sat, 27 Oct 2012 23:31:14 +0000 (01:31 +0200)]
ffplay: check for buffersink_params allocation success

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: always free inputs and outputs in configure_filtergraph
Marton Balint [Sat, 27 Oct 2012 23:19:34 +0000 (01:19 +0200)]
ffplay: always free inputs and outputs in configure_filtergraph

Fixes Coverity CID 733791.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: fill the unused part of the window with black
Marton Balint [Sat, 22 Sep 2012 14:42:13 +0000 (16:42 +0200)]
ffplay: fill the unused part of the window with black

Should fix ticket #1667.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: add update parameter to fill_rectangle
Marton Balint [Sat, 22 Sep 2012 14:27:47 +0000 (16:27 +0200)]
ffplay: add update parameter to fill_rectangle

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agomxfdec: Fix inferred misuses of enums
Tomas Härdin [Wed, 24 Oct 2012 14:30:06 +0000 (16:30 +0200)]
mxfdec: Fix inferred misuses of enums

This fixes CID 700457, 700458 and 703705.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo_probe: check slice order
Michael Niedermayer [Thu, 1 Nov 2012 14:00:20 +0000 (15:00 +0100)]
mpegvideo_probe: check slice order

Fixes: Enrique.mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 1 Nov 2012 12:25:46 +0000 (13:25 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
  avconv_opt, cmdutils: Add missing function parameter Doxygen
  x86: Move optimization suffix to end of function names

Conflicts:
cmdutils.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'
Michael Niedermayer [Thu, 1 Nov 2012 11:53:19 +0000 (12:53 +0100)]
Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
  x86: h264_chromamc_10bit: drop pointless PAVG %define
  x86: mmx2 ---> mmxext in function names
  swscale: do not forget to swap data in formats with different endianness

Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/gradfun.c
libswscale/input.c
libswscale/utils.c
libswscale/x86/swscale.c
tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: add "Notes on filtergraph escaping" section
Stefano Sabatini [Tue, 30 Oct 2012 21:02:29 +0000 (22:02 +0100)]
doc/filters: add "Notes on filtergraph escaping" section

Should help to clarify escaping issues in the filtergraph syntax. In
particular, should address trac ticket #1813.

7 years agorational: test add/sub too
Michael Niedermayer [Thu, 1 Nov 2012 01:42:47 +0000 (02:42 +0100)]
rational: test add/sub too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: allow specifying the file for -report
Michael Niedermayer [Thu, 1 Nov 2012 01:35:22 +0000 (02:35 +0100)]
cmdutils: allow specifying the file for -report

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix typo in platform documentation.
Carl Eugen Hoyos [Thu, 1 Nov 2012 00:45:53 +0000 (01:45 +0100)]
Fix typo in platform documentation.

7 years agoflicvideo: return more meaningful error codes
Paul B Mahol [Thu, 1 Nov 2012 00:28:12 +0000 (00:28 +0000)]
flicvideo: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosws: bump micro for range bugfix
Michael Niedermayer [Wed, 31 Oct 2012 22:04:13 +0000 (23:04 +0100)]
sws: bump micro for range bugfix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeval-test: add some otherwise untested functions.
Michael Niedermayer [Wed, 31 Oct 2012 21:46:58 +0000 (22:46 +0100)]
eval-test: add some otherwise untested functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: fix references to avfilter_* functions that don't exist anymore.
Clément Bœsch [Wed, 31 Oct 2012 19:54:53 +0000 (20:54 +0100)]
lavfi: fix references to avfilter_* functions that don't exist anymore.

7 years agoffv1: assert that there is at least one slice
Paul B Mahol [Wed, 31 Oct 2012 18:01:10 +0000 (18:01 +0000)]
ffv1: assert that there is at least one slice

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
Janne Grunau [Wed, 31 Oct 2012 18:56:02 +0000 (19:56 +0100)]
fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV

Fixes typo in 2cbdd7c92958cb8226491d8eb23ed2d57d4b841e.

7 years agolavfi/hue: add missing GPL dependency.
Clément Bœsch [Wed, 31 Oct 2012 18:11:41 +0000 (19:11 +0100)]
lavfi/hue: add missing GPL dependency.

7 years agoLICENSE: update GPL filter list.
Clément Bœsch [Wed, 31 Oct 2012 18:06:05 +0000 (19:06 +0100)]
LICENSE: update GPL filter list.

7 years agolavfi: remove hqdn3d libmpcodecs wrapper.
Clément Bœsch [Wed, 31 Oct 2012 18:02:57 +0000 (19:02 +0100)]
lavfi: remove hqdn3d libmpcodecs wrapper.

The native filter was ported from the MPlayer project when the mp
wrapper didn't even exist, and when mp=hqdn3d was added, it was already
obsolete.

7 years agoav_image_copy: check for av_image_get_linesize() failure.
Michael Niedermayer [Wed, 31 Oct 2012 17:57:21 +0000 (18:57 +0100)]
av_image_copy: check for av_image_get_linesize() failure.

Fixes CID703722
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutils: fix rounding of micro seconds
Michael Niedermayer [Wed, 31 Oct 2012 17:48:58 +0000 (18:48 +0100)]
utils: fix rounding of micro seconds

Found-by: Johan Wessfeldt <johan.wessfeldt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: h264_chromamc_10bit: drop pointless PAVG %define
Diego Biurrun [Fri, 27 Jul 2012 11:43:33 +0000 (13:43 +0200)]
x86: h264_chromamc_10bit: drop pointless PAVG %define

It is only used in one place so there is no need for the abstraction.

7 years agoavconv_opt, cmdutils: Add missing function parameter Doxygen
Diego Biurrun [Wed, 24 Oct 2012 17:20:13 +0000 (19:20 +0200)]
avconv_opt, cmdutils: Add missing function parameter Doxygen

7 years agox86: Move optimization suffix to end of function names
Diego Biurrun [Fri, 27 Jul 2012 12:09:52 +0000 (14:09 +0200)]
x86: Move optimization suffix to end of function names

This simplifies cpuflags porting.

7 years agox86: mmx2 ---> mmxext in function names
Diego Biurrun [Sun, 8 Jul 2012 17:56:10 +0000 (19:56 +0200)]
x86: mmx2 ---> mmxext in function names

7 years agoswscale: do not forget to swap data in formats with different endianness
Kostya Shishkov [Wed, 31 Oct 2012 10:26:32 +0000 (11:26 +0100)]
swscale: do not forget to swap data in formats with different endianness

Otherwise during scaling it will try to interpret input in the wrong way and
that leads to the test results disagreeing on different platforms and with
different optimizations.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agofile: typo
Michael Niedermayer [Wed, 31 Oct 2012 16:01:52 +0000 (17:01 +0100)]
file: typo

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoav_tempfile: document umask() issue
Michael Niedermayer [Wed, 31 Oct 2012 15:09:02 +0000 (16:09 +0100)]
av_tempfile: document umask() issue

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/scale: avoid to print a NULL value in log message
Stefano Sabatini [Wed, 31 Oct 2012 14:45:28 +0000 (15:45 +0100)]
lavfi/scale: avoid to print a NULL value in log message

Fix possible crash occurring when libc does not support NULL printing.

7 years agoFix #1827, segfault with XXCH samples when downsampling.
Nick Brereton [Tue, 30 Oct 2012 22:38:42 +0000 (22:38 +0000)]
Fix #1827, segfault with XXCH samples when downsampling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/avienc: fix/extend error message, in case of too large number of skipped frames
Stefano Sabatini [Wed, 31 Oct 2012 13:17:34 +0000 (14:17 +0100)]
lavf/avienc: fix/extend error message, in case of too large number of skipped frames

7 years agolavf/avienc: enable debug log
Stefano Sabatini [Wed, 31 Oct 2012 12:55:00 +0000 (13:55 +0100)]
lavf/avienc: enable debug log

7 years agolavfi/mp: drop the mp=rectangle filter
Stefano Sabatini [Wed, 31 Oct 2012 13:39:55 +0000 (14:39 +0100)]
lavfi/mp: drop the mp=rectangle filter

All the rectangle features have been ported to the native drawbox filter,
which has an equivalent syntax.

7 years agolavfi/drawbox: add "width" and "height" aliases for "w" and "h" options
Stefano Sabatini [Wed, 31 Oct 2012 11:25:33 +0000 (12:25 +0100)]
lavfi/drawbox: add "width" and "height" aliases for "w" and "h" options

7 years agolavfi/drawbox: add thickness option
Stefano Sabatini [Tue, 30 Oct 2012 19:40:19 +0000 (20:40 +0100)]
lavfi/drawbox: add thickness option

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 31 Oct 2012 13:26:11 +0000 (14:26 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Drop some unused function arguments
  x86: Fix assembly with NASM
  x86: fmtconvert: Refactor cvtps2pi emulation through cpuflags

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'be923ed659016350592acb9b3346f706f8170ac5'
Michael Niedermayer [Wed, 31 Oct 2012 13:16:04 +0000 (14:16 +0100)]
Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

* commit 'be923ed659016350592acb9b3346f706f8170ac5':
  x86: fmtconvert: port to cpuflags
  x86: MMX2 ---> MMXEXT in macro names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a65bdceb060628881578afb29df4eb222421381f'
Michael Niedermayer [Wed, 31 Oct 2012 13:08:49 +0000 (14:08 +0100)]
Merge commit 'a65bdceb060628881578afb29df4eb222421381f'

* commit 'a65bdceb060628881578afb29df4eb222421381f':
  x86: mmx2 ---> mmxext in variable names

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '652f5185945c8405fc57aed353286858df8d066f'
Michael Niedermayer [Wed, 31 Oct 2012 13:02:35 +0000 (14:02 +0100)]
Merge commit '652f5185945c8405fc57aed353286858df8d066f'

* commit '652f5185945c8405fc57aed353286858df8d066f':
  x86: mmx2 ---> mmxext in comments and messages

Conflicts:
libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '04581c8c77ce779e4e70684ac45302972766be0f'
Michael Niedermayer [Wed, 31 Oct 2012 12:57:09 +0000 (13:57 +0100)]
Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

* commit '04581c8c77ce779e4e70684ac45302972766be0f':
  x86: yasm: Use complete source path for macro helper %includes

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: Fix assembly with NASM
Dave Yeo [Wed, 31 Oct 2012 06:48:26 +0000 (23:48 -0700)]
x86: Fix assembly with NASM

Unlike YASM, NASM only looks for include files in the current
directory, not in the directory that included files reside in.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoMerge commit '6860b4081d046558c44b1b42f22022ea341a2a73'
Michael Niedermayer [Wed, 31 Oct 2012 12:30:03 +0000 (13:30 +0100)]
Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

* commit '6860b4081d046558c44b1b42f22022ea341a2a73':
  x86: include x86inc.asm in x86util.asm
  cng: Reindent some incorrectly indented lines
  cngdec: Allow flushing the decoder
  cngdec: Make the dbov variable have the right unit
  cngdec: Fix the memset size to cover the full array
  cngdec: Update the LPC coefficients after averaging the reflection coefficients
  configure: fix print_config() with broke awks

Conflicts:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dct32.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputilenc.asm
libavcodec/x86/fft.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_10bit.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoprobetest: fix possible use of uninitialized data
Michael Niedermayer [Wed, 31 Oct 2012 12:16:52 +0000 (13:16 +0100)]
probetest: fix possible use of uninitialized data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/drawbox: remove some unnecessary parentheses
Stefano Sabatini [Wed, 31 Oct 2012 11:20:50 +0000 (12:20 +0100)]
lavfi/drawbox: remove some unnecessary parentheses

7 years agolavfi/drawbox: reindent after previous commit
Stefano Sabatini [Tue, 30 Oct 2012 19:17:24 +0000 (20:17 +0100)]
lavfi/drawbox: reindent after previous commit

7 years agolavfi/drawbox: implement color=invert mode
Stefano Sabatini [Tue, 30 Oct 2012 19:14:07 +0000 (20:14 +0100)]
lavfi/drawbox: implement color=invert mode

Based on a libmpcodecs/vf_rectangle.c feature.

7 years agolavfi/mp: drop wrapped field filter
Stefano Sabatini [Wed, 31 Oct 2012 11:10:07 +0000 (12:10 +0100)]
lavfi/mp: drop wrapped field filter

The filter has been ported to a native libavfilter filter.

7 years agolavfi: add field filter
Stefano Sabatini [Tue, 30 Oct 2012 11:15:28 +0000 (12:15 +0100)]
lavfi: add field filter

The filter is a port of libmpcodecs/vf_field.c, since there is no common
code I relicensed it as LGPL, while keeping the original author
copyright.

7 years agoaacdec: Drop some unused function arguments
Diego Biurrun [Wed, 24 Oct 2012 17:15:54 +0000 (19:15 +0200)]
aacdec: Drop some unused function arguments

7 years agox86: Fix assembly with NASM
Dave Yeo [Wed, 31 Oct 2012 06:48:26 +0000 (23:48 -0700)]
x86: Fix assembly with NASM

Unlike YASM, NASM only looks for include files in the current
directory, not in the directory that included files reside in.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoav_get_audio_frame_duration: add IAC
Paul B Mahol [Wed, 31 Oct 2012 03:44:37 +0000 (03:44 +0000)]
av_get_audio_frame_duration: add IAC

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopix_fmt_info: add 9/10 bit YUVA formats
Michael Niedermayer [Wed, 31 Oct 2012 01:14:16 +0000 (02:14 +0100)]
pix_fmt_info: add 9/10 bit YUVA formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotree-test: fix printf() types
Michael Niedermayer [Tue, 30 Oct 2012 21:34:36 +0000 (22:34 +0100)]
tree-test: fix printf() types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: fix handling of big endian alpha
Michael Niedermayer [Wed, 31 Oct 2012 02:03:32 +0000 (03:03 +0100)]
sws: fix handling of big endian alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: fmtconvert: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 13:42:17 +0000 (15:42 +0200)]
x86: fmtconvert: port to cpuflags

7 years agox86: fmtconvert: Refactor cvtps2pi emulation through cpuflags
Diego Biurrun [Sun, 15 Jul 2012 17:55:21 +0000 (19:55 +0200)]
x86: fmtconvert: Refactor cvtps2pi emulation through cpuflags

7 years agox86: MMX2 ---> MMXEXT in macro names
Diego Biurrun [Sun, 8 Jul 2012 17:28:57 +0000 (19:28 +0200)]
x86: MMX2 ---> MMXEXT in macro names

7 years agox86: mmx2 ---> mmxext in variable names
Diego Biurrun [Sun, 8 Jul 2012 17:55:31 +0000 (19:55 +0200)]
x86: mmx2 ---> mmxext in variable names

7 years agox86: mmx2 ---> mmxext in comments and messages
Diego Biurrun [Sun, 8 Jul 2012 17:16:20 +0000 (19:16 +0200)]
x86: mmx2 ---> mmxext in comments and messages

7 years agox86: yasm: Use complete source path for macro helper %includes
Diego Biurrun [Sun, 15 Jul 2012 09:48:21 +0000 (11:48 +0200)]
x86: yasm: Use complete source path for macro helper %includes

This is more consistent with the way we handle C #includes and
it simplifies the build system.

7 years agox86: include x86inc.asm in x86util.asm
Diego Biurrun [Sat, 7 Jul 2012 23:20:48 +0000 (01:20 +0200)]
x86: include x86inc.asm in x86util.asm

This is necessary to allow refactoring some x86util macros with cpuflags.

7 years agodoc/filters: fix typo in drawbox section
Stefano Sabatini [Tue, 30 Oct 2012 22:48:24 +0000 (23:48 +0100)]
doc/filters: fix typo in drawbox section

7 years agodoc/filters: itemize examples for drawbox, add an example, fix grammar
Stefano Sabatini [Tue, 30 Oct 2012 18:45:46 +0000 (19:45 +0100)]
doc/filters: itemize examples for drawbox, add an example, fix grammar

7 years agolavfi/drawbox: extend syntax, accept named options
Stefano Sabatini [Tue, 30 Oct 2012 18:42:40 +0000 (19:42 +0100)]
lavfi/drawbox: extend syntax, accept named options

7 years agolavfi/tinterlace: remove poll_frame() callback
Stefano Sabatini [Tue, 4 Sep 2012 18:12:15 +0000 (20:12 +0200)]
lavfi/tinterlace: remove poll_frame() callback

That interface is deprecated, and apparently useless.

7 years agoav_get_audio_frame_duration: add G723_1
Paul B Mahol [Tue, 30 Oct 2012 21:20:38 +0000 (21:20 +0000)]
av_get_audio_frame_duration: add G723_1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi: remove yuvcsp and yvu9 libmpcodecs wrappers
Paul B Mahol [Fri, 26 Oct 2012 18:27:39 +0000 (18:27 +0000)]
lavfi: remove yuvcsp and yvu9 libmpcodecs wrappers

Same functionality is provided by libswscale.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agowavenc: fix curruption of metadata
Michael Niedermayer [Tue, 30 Oct 2012 20:48:39 +0000 (21:48 +0100)]
wavenc: fix curruption of metadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: remove typo, reenable AC3 tests
Michael Niedermayer [Tue, 30 Oct 2012 19:53:30 +0000 (20:53 +0100)]
fate: remove typo, reenable AC3 tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoav_get_audio_frame_duration: fix IMC
Michael Niedermayer [Tue, 30 Oct 2012 19:27:55 +0000 (20:27 +0100)]
av_get_audio_frame_duration: fix IMC

Fixes Ticket1658
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: const correctness for avpicture_fill()
Paul B Mahol [Tue, 30 Oct 2012 03:27:09 +0000 (03:27 +0000)]
lavc: const correctness for avpicture_fill()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/smartblur: add missing draw slice call.
Clément Bœsch [Tue, 30 Oct 2012 18:36:01 +0000 (19:36 +0100)]
lavfi/smartblur: add missing draw slice call.

This fixes output with filtergraphs such as 'split[a][b];
[a]pad=iw*2[src]; [b]smartblur=1:1:1[filt]; [src][filt]overlay=w'

7 years agoaf_ashowinfo: integrate config_input() in filter_samples.
Michael Niedermayer [Tue, 30 Oct 2012 17:59:19 +0000 (18:59 +0100)]
af_ashowinfo: integrate config_input() in filter_samples.

This is simpler and also should allow the code to function when the
channel number changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: fix print_config() with broke awks
Mans Rullgard [Tue, 30 Oct 2012 11:57:30 +0000 (11:57 +0000)]
configure: fix print_config() with broke awks

Some awk versions do not treat the result of unary + on a (numeric)
string as numeric, giving wrong results when used in a boolean context
Using unary - instead is logically equivalent works as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoswscale.c:remove fill_plane9or10() use fillPlane16()
Michael Niedermayer [Tue, 30 Oct 2012 17:40:55 +0000 (18:40 +0100)]
swscale.c:remove fill_plane9or10() use fillPlane16()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: move fillPlane16() to header so it can be used from more than 1 place
Michael Niedermayer [Tue, 30 Oct 2012 17:39:44 +0000 (18:39 +0100)]
sws: move fillPlane16() to header so it can be used from more than 1 place

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws_unscaled: drop fill_plane9or10()
Michael Niedermayer [Tue, 30 Oct 2012 17:25:05 +0000 (18:25 +0100)]
sws_unscaled: drop fill_plane9or10()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChange my GPG fingerprint
Tomas Härdin [Mon, 29 Oct 2012 09:30:32 +0000 (10:30 +0100)]
Change my GPG fingerprint

The old key expired

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: fix BE/LE handling for fillPlane16()
Michael Niedermayer [Tue, 30 Oct 2012 17:11:52 +0000 (18:11 +0100)]
sws: fix BE/LE handling for fillPlane16()

Based on fill_plane9or10() by luca barbato

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 30 Oct 2012 16:41:17 +0000 (17:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pixfmt: support more yuva formats
  swscale: support gray to 9bit and 10bit formats
  configure: rewrite print_config() function using awk
  FATE: fix (AD)PCM test dependencies broken in e519990
  Use ptrdiff_t instead of int for intra pred "stride" function parameter.
  x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.

Conflicts:
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavutil/pixfmt.h
libswscale/swscale_unscaled.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: remove palette libmpcodecs wrapper
Paul B Mahol [Fri, 26 Oct 2012 17:59:40 +0000 (17:59 +0000)]
lavfi: remove palette libmpcodecs wrapper

The filter is useless, swscale should be used instead.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoff: fix case where image does not have alpha channel
Paul B Mahol [Tue, 30 Oct 2012 15:28:13 +0000 (15:28 +0000)]
ff: fix case where image does not have alpha channel

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agocng: Reindent some incorrectly indented lines
Martin Storsjö [Tue, 30 Oct 2012 10:09:57 +0000 (12:09 +0200)]
cng: Reindent some incorrectly indented lines

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agocngdec: Allow flushing the decoder
Martin Storsjö [Tue, 30 Oct 2012 10:03:25 +0000 (12:03 +0200)]
cngdec: Allow flushing the decoder

After a flush, don't average the output envelope and energy with
previous iterations.

Also start directly from the target values for the first iteration
at startup.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agocngdec: Make the dbov variable have the right unit
Martin Storsjö [Tue, 30 Oct 2012 09:56:54 +0000 (11:56 +0200)]
cngdec: Make the dbov variable have the right unit

Previously the unit of the variable was Bov, not dBov.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agocngdec: Fix the memset size to cover the full array
Martin Storsjö [Tue, 30 Oct 2012 10:17:35 +0000 (12:17 +0200)]
cngdec: Fix the memset size to cover the full array

This was a leftover from previous iterations of the code, where the
refl coef arrays were statically allocated.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agocngdec: Update the LPC coefficients after averaging the reflection coefficients
Martin Storsjö [Tue, 30 Oct 2012 10:26:39 +0000 (12:26 +0200)]
cngdec: Update the LPC coefficients after averaging the reflection coefficients

I somehow messed up the placement of this one.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge commit '08b028c18dc31b6de741861b9555669dcca4d12a'
Michael Niedermayer [Tue, 30 Oct 2012 14:22:13 +0000 (15:22 +0100)]
Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'

* commit '08b028c18dc31b6de741861b9555669dcca4d12a':
  Remove INIT_AVX from x86inc.asm.
  Remove usage of INIT_AVX in h264_intrapred_10bit.asm.
  dv: fix indentation

Conflicts:
libavformat/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
Michael Niedermayer [Tue, 30 Oct 2012 13:40:22 +0000 (14:40 +0100)]
Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'

* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
  dv: use AVStream.index instead of abusing AVStream.id
  lavfi: add ashowinfo filter
  avcodec: Add a RFC 3389 comfort noise codec
  lpc: Add a function for calculating reflection coefficients from samples
  lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
  lavr: document upper bound on number of output samples.
  lavr: add general API usage doxy
  indeo3: remove duplicate capabilities line.
  fate: ac3: Add dependencies

Conflicts:
Changelog
doc/filters.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/af_ashowinfo.c
libavfilter/allfilters.c
libavfilter/version.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: fix print_config() with broke awks
Mans Rullgard [Tue, 30 Oct 2012 11:57:30 +0000 (11:57 +0000)]
configure: fix print_config() with broke awks

Some awk versions do not treat the result of unary + on a (numeric)
string as numeric, giving wrong results when used in a boolean context
Using unary - instead is logically equivalent works as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge commit '381dc1a5ec0925b281c573457c413ae643567086'
Michael Niedermayer [Tue, 30 Oct 2012 12:45:44 +0000 (13:45 +0100)]
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'

* commit '381dc1a5ec0925b281c573457c413ae643567086':
  fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
  fate: Add shorthands for acodec PCM and ADPCM tests
  avconv: Drop unused function argument from do_video_stats()
  cmdutils: Conditionally compile libswscale-related bits
  aacenc: Drop some unused function arguments
  rtsp: Avoid a cast when calling strtol
  nut: support textual data
  nutenc: verbosely report unsupported negative pts

Conflicts:
cmdutils.c
ffmpeg.c
libavformat/nut.c
libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorawdec: check avpicture_get_size() return value
Michael Niedermayer [Tue, 30 Oct 2012 03:35:38 +0000 (04:35 +0100)]
rawdec: check avpicture_get_size() return value

Fixes CID205019
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoPartly revert f174fba: yop decoder does not support direct rendering.
Carl Eugen Hoyos [Tue, 30 Oct 2012 11:09:25 +0000 (12:09 +0100)]
Partly revert f174fba: yop decoder does not support direct rendering.

7 years agopixfmt: support more yuva formats
Luca Barbato [Sun, 14 Oct 2012 06:06:27 +0000 (08:06 +0200)]
pixfmt: support more yuva formats

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoswscale: support gray to 9bit and 10bit formats
Luca Barbato [Mon, 29 Oct 2012 18:07:01 +0000 (19:07 +0100)]
swscale: support gray to 9bit and 10bit formats

With the input of Kostya and Ronald.

7 years agoPartly revert f174fba: indeo3 decoder does not support direct rendering.
Carl Eugen Hoyos [Tue, 30 Oct 2012 10:51:58 +0000 (11:51 +0100)]
Partly revert f174fba: indeo3 decoder does not support direct rendering.