ffmpeg.git
6 years agoffplay: factor display rectangle calculation to its own function
Marton Balint [Sat, 1 Sep 2012 12:35:00 +0000 (14:35 +0200)]
ffplay: factor display rectangle calculation to its own function

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoexamples/muxing: add check on avformat_write_header() result
Stefano Sabatini [Tue, 11 Sep 2012 16:25:58 +0000 (18:25 +0200)]
examples/muxing: add check on avformat_write_header() result

6 years agoexamples/muxing: apply misc fixes to log messages
Stefano Sabatini [Tue, 11 Sep 2012 16:23:58 +0000 (18:23 +0200)]
examples/muxing: apply misc fixes to log messages

6 years agoexamples/muxing: rename img_convert_ctx to sws_ctx
Stefano Sabatini [Tue, 11 Sep 2012 16:21:59 +0000 (18:21 +0200)]
examples/muxing: rename img_convert_ctx to sws_ctx

The new name is more consistent with the codebase, and more
self-consistent with the libswscale API.

6 years agoexamples/muxing: merge some declarations and definitions
Stefano Sabatini [Tue, 11 Sep 2012 16:20:20 +0000 (18:20 +0200)]
examples/muxing: merge some declarations and definitions

6 years agoexamples/muxing: prefer AVPicture to AVFrame, when feasible
Stefano Sabatini [Tue, 11 Sep 2012 16:13:20 +0000 (18:13 +0200)]
examples/muxing: prefer AVPicture to AVFrame, when feasible

Favor the use of plain AVPicture over AVFrame, especially when the use of
AVFrame is not required like in the case of tmp_picture.

Also adopt more straightforward names, to avoid frame/picture confusion.

6 years agopostproc: Fix unprotected inline asm
Derek Buitenhuis [Tue, 11 Sep 2012 15:31:12 +0000 (11:31 -0400)]
postproc: Fix unprotected inline asm

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/flvenc: convert commented debug log to an av_dlog call
Stefano Sabatini [Thu, 6 Sep 2012 15:32:26 +0000 (17:32 +0200)]
lavf/flvenc: convert commented debug log to an av_dlog call

Also add some additional info (DTS and DTS time).

6 years agolavfi/amerge: clarify the error message in case of input overlap
Stefano Sabatini [Tue, 11 Sep 2012 08:32:13 +0000 (10:32 +0200)]
lavfi/amerge: clarify the error message in case of input overlap

6 years agolavfi/amerge: avoid a forward declaration.
Clément Bœsch [Tue, 11 Sep 2012 16:36:09 +0000 (18:36 +0200)]
lavfi/amerge: avoid a forward declaration.

6 years agoratecontrol: change a commented printf to av_log
Michael Niedermayer [Tue, 11 Sep 2012 15:41:33 +0000 (17:41 +0200)]
ratecontrol: change a commented printf to av_log

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoratecontrol: fix get_fps() argument
Michael Niedermayer [Tue, 11 Sep 2012 15:40:54 +0000 (17:40 +0200)]
ratecontrol: fix get_fps() argument

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoratecontrol: Dynamically choose a default for rc_max_available_vbv_use
Michael Niedermayer [Tue, 11 Sep 2012 15:38:31 +0000 (17:38 +0200)]
ratecontrol: Dynamically choose a default for rc_max_available_vbv_use

This improves handling of small buffer sizes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoratecontrol: correct predictor in case of stuffing
Michael Niedermayer [Tue, 11 Sep 2012 15:20:08 +0000 (17:20 +0200)]
ratecontrol: correct predictor in case of stuffing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/demuxing: add audio decoding/demuxing
Stefano Sabatini [Fri, 7 Sep 2012 16:09:19 +0000 (18:09 +0200)]
examples/demuxing: add audio decoding/demuxing

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 11 Sep 2012 13:24:22 +0000 (15:24 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec_jpeg: Add support for default quantizers
  x86: dsputil: Move specific optimization settings out of global init function
  avplay: get rid of ugly casts in the options table
  avplay: fix prototypes for option callbacks.
  flvdec: always set AVFMTCTX_NOHEADER.
  file: Use a normal private context for storing the file descriptor
  configure: Adjust the xgetbv instrinsic check
  configure: Add --disable-inline-asm command line option
  configure: Don't try to enable the log2 function on msvcrt

Conflicts:
configure
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavformat/file.c
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/amerge: fix input pad name behaviour.
Clément Bœsch [Tue, 11 Sep 2012 04:41:55 +0000 (06:41 +0200)]
lavfi/amerge: fix input pad name behaviour.

This fixes two problems:
 - the invalid pad.name stack pointer after init() ends
 - the duplicated name for all inputs

6 years agoThe TrueHD decoder needs the MLP parser.
Carl Eugen Hoyos [Tue, 11 Sep 2012 10:19:09 +0000 (12:19 +0200)]
The TrueHD decoder needs the MLP parser.

6 years agortpdec_jpeg: Add support for default quantizers
Samuel Pitoiset [Mon, 10 Sep 2012 19:15:09 +0000 (21:15 +0200)]
rtpdec_jpeg: Add support for default quantizers

Generate quantization tables when they are not present in the
first chunk.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: dsputil: Move specific optimization settings out of global init function
Diego Biurrun [Wed, 5 Sep 2012 14:42:57 +0000 (16:42 +0200)]
x86: dsputil: Move specific optimization settings out of global init function

They belong in the init functions specific to each CPU capability.

6 years agoavplay: get rid of ugly casts in the options table
Anton Khirnov [Mon, 10 Sep 2012 12:42:24 +0000 (14:42 +0200)]
avplay: get rid of ugly casts in the options table

6 years agoavplay: fix prototypes for option callbacks.
Anton Khirnov [Mon, 10 Sep 2012 12:37:46 +0000 (14:37 +0200)]
avplay: fix prototypes for option callbacks.

They have been wrong since 11d957fbd81288e64408e79ed369446346000b29

6 years agoflvdec: always set AVFMTCTX_NOHEADER.
Anton Khirnov [Sat, 1 Sep 2012 14:20:58 +0000 (16:20 +0200)]
flvdec: always set AVFMTCTX_NOHEADER.

New streams may be created at any time, e.g. on codec change.

6 years agocavsdec/decode_mb_b: fix return type
Michael Niedermayer [Tue, 11 Sep 2012 05:13:49 +0000 (07:13 +0200)]
cavsdec/decode_mb_b: fix return type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoxtea: optimize core, about 4-5% faster.
Michael Niedermayer [Tue, 11 Sep 2012 02:55:01 +0000 (04:55 +0200)]
xtea: optimize core, about 4-5% faster.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/swscale: use unsigned to build SIMD values to avoid signed overflow
Michael Niedermayer [Tue, 11 Sep 2012 00:52:12 +0000 (02:52 +0200)]
x86/swscale: use unsigned to build SIMD values to avoid signed overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/avformat_seek_file: fix harmless integer overflow
Michael Niedermayer [Tue, 11 Sep 2012 00:51:09 +0000 (02:51 +0200)]
lavf/avformat_seek_file: fix harmless integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacdec/lcg_random: fix harmless integer overflow
Michael Niedermayer [Mon, 10 Sep 2012 23:58:03 +0000 (01:58 +0200)]
aacdec/lcg_random: fix harmless integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocavsdec: Fix assertion failure.
Michael Niedermayer [Mon, 10 Sep 2012 21:28:48 +0000 (23:28 +0200)]
cavsdec: Fix assertion failure.

The assert in decode_mb_b() is replaced by a normal error check for the
case that can occur with a damaged or crafted bitstream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/segment: add segment_list_flags option
Stefano Sabatini [Sat, 1 Sep 2012 16:01:51 +0000 (18:01 +0200)]
lavf/segment: add segment_list_flags option

Allow to specify options affecting the segment list generation.

In particular: add +live and +cache flags.

For a full discussion read trac ticket #1642:
http://ffmpeg.org/trac/ffmpeg/ticket/1642

Also add live M3U8 generation example.

6 years agolavc/h263dec: return or propagate proper error codes
Stefano Sabatini [Mon, 10 Sep 2012 16:08:09 +0000 (18:08 +0200)]
lavc/h263dec: return or propagate proper error codes

6 years agolavc/flvdec: return meaningful error codes
Stefano Sabatini [Mon, 10 Sep 2012 16:07:49 +0000 (18:07 +0200)]
lavc/flvdec: return meaningful error codes

6 years agoffprobe: add print_section option to the compact writer
Stefano Sabatini [Mon, 10 Sep 2012 11:36:27 +0000 (13:36 +0200)]
ffprobe: add print_section option to the compact writer

Allow to skip section name at the begin of each line. Possibly simplify
output.

6 years agoffprobe: add and use DEFINE_WRITER_CLASS macro
Stefano Sabatini [Mon, 10 Sep 2012 08:49:03 +0000 (10:49 +0200)]
ffprobe: add and use DEFINE_WRITER_CLASS macro

Factorize writer class definition.

6 years agompegaudiodec: replace pow(2.0,...) by exp2()
Michael Niedermayer [Mon, 10 Sep 2012 20:34:18 +0000 (22:34 +0200)]
mpegaudiodec: replace pow(2.0,...) by exp2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatrac3: replace powf(2,...) by exp2f()
Michael Niedermayer [Mon, 10 Sep 2012 20:32:56 +0000 (22:32 +0200)]
atrac3: replace powf(2,...) by exp2f()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws/output: use unsigned variables where harmless overflows are expected.
Michael Niedermayer [Mon, 10 Sep 2012 18:55:45 +0000 (20:55 +0200)]
sws/output: use unsigned variables where harmless overflows are expected.

signed overflow is undefined in C ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agora144enc: avoid integer overflows.
Michael Niedermayer [Mon, 10 Sep 2012 18:54:03 +0000 (20:54 +0200)]
ra144enc: avoid integer overflows.

The values are all positive but signed variables where used,
which overflowed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: check timebase validity before considering it to be used for stream copy
Michael Niedermayer [Mon, 10 Sep 2012 18:52:40 +0000 (20:52 +0200)]
ffmpeg: check timebase validity before considering it to be used for stream copy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix bytes written statistics.
Michael Niedermayer [Mon, 10 Sep 2012 18:51:27 +0000 (20:51 +0200)]
ffmpeg: fix bytes written statistics.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegtsenc: add forgotten ()
Michael Niedermayer [Mon, 10 Sep 2012 18:15:58 +0000 (20:15 +0200)]
mpegtsenc: add forgotten ()

Fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/setpts: set SAMPLE_RATE to NAN when input is no audio
Stefano Sabatini [Mon, 10 Sep 2012 10:02:30 +0000 (12:02 +0200)]
lavfi/setpts: set SAMPLE_RATE to NAN when input is no audio

Should be more robust/consistent.

6 years agolavfi/setpts: add FRAME_RATE constant
Stefano Sabatini [Mon, 10 Sep 2012 09:58:53 +0000 (11:58 +0200)]
lavfi/setpts: add FRAME_RATE constant

Useful for dealing with constant frame-rate video.

6 years agofile: Use a normal private context for storing the file descriptor
Martin Storsjö [Sun, 9 Sep 2012 19:35:50 +0000 (22:35 +0300)]
file: Use a normal private context for storing the file descriptor

Previously the file descriptor was stored in the priv_data pointer.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: Adjust the xgetbv instrinsic check
Martin Storsjö [Mon, 10 Sep 2012 14:35:39 +0000 (17:35 +0300)]
configure: Adjust the xgetbv instrinsic check

The 64 bit cl.exe version 16.00.30319.01 crashes with an internal
compiler error on the current check (and thus deduces it isn't
supported, even if the actual usage in libavuil/x86/cpu.c works
fine), but by assigning the value from the intrinsic to a variable,
or returning it, it works fine.

This error is fixed in cl.exe version 16.00.40219.01.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: Add --disable-inline-asm command line option
Diego Biurrun [Tue, 4 Sep 2012 16:23:25 +0000 (18:23 +0200)]
configure: Add --disable-inline-asm command line option

This can come in handy for testing and possibly other purposes.

6 years agoadd OTF support for attachments
Sébastien Brochet [Sun, 9 Sep 2012 09:00:27 +0000 (11:00 +0200)]
add OTF support for attachments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutils/update_stream_timings: fix division by zero
Michael Niedermayer [Mon, 10 Sep 2012 14:57:31 +0000 (16:57 +0200)]
utils/update_stream_timings: fix division by zero

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavidec/guess_ni_flag: fix harmless integer overflow
Michael Niedermayer [Mon, 10 Sep 2012 14:56:59 +0000 (16:56 +0200)]
avidec/guess_ni_flag: fix harmless integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Don't try to enable the log2 function on msvcrt
Martin Storsjö [Mon, 10 Sep 2012 12:34:51 +0000 (15:34 +0300)]
configure: Don't try to enable the log2 function on msvcrt

Some msvcrt versions (the static 64 bit libc in MSVC 10) have
a log2 function, but there is no declaration for it in the headers.
Therefore, the normal configure check might find it, but it can fail
during build or at runtime, depending on whether implicit function
declarations are an error or not.

Therefore simply ignore this function on this platform.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocompute_pkt_fields: fix harmless integer overflow
Michael Niedermayer [Mon, 10 Sep 2012 14:15:07 +0000 (16:15 +0200)]
compute_pkt_fields: fix harmless integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/pngenc: Enable frame threading for PNG encodes
Ben Jackson [Mon, 10 Sep 2012 05:40:41 +0000 (22:40 -0700)]
lavc/pngenc: Enable frame threading for PNG encodes

Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Sep 2012 12:05:42 +0000 (14:05 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Only compile motion_est code when encoders are enabled
  mem: fix typo in check for __ICC
  fate: mp3: drop redundant CMP setting
  rtp: Depacketization of JPEG (RFC 2435)
  Rename ff_put_string to avpriv_put_string
  mjpeg: Rename some symbols to avpriv_* instead of ff_*
  yadif: cosmetics

Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: simplify default printer
Stefano Sabatini [Sun, 9 Sep 2012 11:59:02 +0000 (13:59 +0200)]
ffprobe: simplify default printer

Remove pointless default_print_footer() and
default_print_chapter_header() callbacks, also avoid to print an
empty line when noprint_wrappers is selected.

6 years agox86: dsputil: Only compile motion_est code when encoders are enabled
Diego Biurrun [Sun, 9 Sep 2012 19:19:50 +0000 (21:19 +0200)]
x86: dsputil: Only compile motion_est code when encoders are enabled

6 years agomem: fix typo in check for __ICC
Mans Rullgard [Sun, 9 Sep 2012 21:47:15 +0000 (22:47 +0100)]
mem: fix typo in check for __ICC

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agofate: mp3: drop redundant CMP setting
Mans Rullgard [Sun, 9 Sep 2012 15:49:54 +0000 (16:49 +0100)]
fate: mp3: drop redundant CMP setting

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoaacdec.c: fix some comments
Reinhard Nissl [Sun, 9 Sep 2012 19:55:23 +0000 (21:55 +0200)]
aacdec.c: fix some comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortp: Depacketization of JPEG (RFC 2435)
Samuel Pitoiset [Fri, 7 Sep 2012 17:30:23 +0000 (19:30 +0200)]
rtp: Depacketization of JPEG (RFC 2435)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoRename ff_put_string to avpriv_put_string
Martin Storsjö [Sun, 9 Sep 2012 13:03:52 +0000 (16:03 +0300)]
Rename ff_put_string to avpriv_put_string

This allows using it from libavformat as well. This will be used
by the RTP/JPEG depacketizer.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomjpeg: Rename some symbols to avpriv_* instead of ff_*
Samuel Pitoiset [Thu, 6 Sep 2012 13:50:20 +0000 (15:50 +0200)]
mjpeg: Rename some symbols to avpriv_* instead of ff_*

These symbols will be used from the RTP/JPEG depacketizer.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agofile: Add S_ISFIFO compatability macro
Derek Buitenhuis [Fri, 7 Sep 2012 13:45:09 +0000 (09:45 -0400)]
file: Add S_ISFIFO compatability macro

Not all systems have S_ISFIFO.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx
Michael Niedermayer [Sun, 9 Sep 2012 16:34:21 +0000 (18:34 +0200)]
x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx

this is a regression since today

Found-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil_template: Reindent after recent change
Derek Buitenhuis [Sun, 9 Sep 2012 11:02:51 +0000 (07:02 -0400)]
dsputil_template: Reindent after recent change

Forgot to keep it pretty in e62e455f7b4c5b148f5a289ba823dcc71d6ca389.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/h264dsp_init: put a HAVE_YASM back
Michael Niedermayer [Sun, 9 Sep 2012 15:21:02 +0000 (17:21 +0200)]
x86/h264dsp_init: put a HAVE_YASM back

Should fix compilation on open solaris

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: cosmetics
Luca Barbato [Sat, 1 Sep 2012 14:04:42 +0000 (16:04 +0200)]
yadif: cosmetics

6 years agotiff/doubles2str: check for truncation
Michael Niedermayer [Sun, 9 Sep 2012 12:41:18 +0000 (14:41 +0200)]
tiff/doubles2str: check for truncation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotiff/doubles2str: factor out component_len
Michael Niedermayer [Sun, 9 Sep 2012 12:40:10 +0000 (14:40 +0200)]
tiff/doubles2str: factor out component_len

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogxfenc: assert that the to be written data has not been truncated.
Michael Niedermayer [Sun, 9 Sep 2012 12:31:44 +0000 (14:31 +0200)]
gxfenc: assert that the to be written data has not been truncated.

Otherwise out of array reads would happen later

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogxfenc: dont duplicate buffer size
Michael Niedermayer [Sun, 9 Sep 2012 12:31:06 +0000 (14:31 +0200)]
gxfenc: dont duplicate buffer size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: avoid unsafe usage of the snprintf() return code
Michael Niedermayer [Sun, 9 Sep 2012 12:26:42 +0000 (14:26 +0200)]
ffprobe: avoid unsafe usage of the snprintf() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosrtdec: fix unsafe snprintf() return usage
Michael Niedermayer [Sun, 9 Sep 2012 12:13:04 +0000 (14:13 +0200)]
srtdec: fix unsafe snprintf() return usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoass: assert that the timsstamps fitted in the buffers
Michael Niedermayer [Sun, 9 Sep 2012 12:11:34 +0000 (14:11 +0200)]
ass: assert that the timsstamps fitted in the buffers

Failure of the assert would cause various problems later
if we continue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_filter: fix unsafe snprintf() usage
Michael Niedermayer [Sun, 9 Sep 2012 12:11:03 +0000 (14:11 +0200)]
ffmpeg_filter: fix unsafe snprintf() usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: fix unsafe snprintf() return usage.
Michael Niedermayer [Sun, 9 Sep 2012 12:10:11 +0000 (14:10 +0200)]
ffserver: fix unsafe snprintf() return usage.

Found-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: increase buffer size in http_send_too_busy_reply()
Michael Niedermayer [Sun, 9 Sep 2012 11:35:01 +0000 (13:35 +0200)]
ffserver: increase buffer size in http_send_too_busy_reply()

also add a assert0 to make sure the data is not truncated (which
should be impossible now)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Sep 2012 11:27:42 +0000 (13:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Provide the right alignment for external mmx asm
  x86: Replace checks for CPU extensions and flags by convenience macros
  configure: msvc: fix/simplify setting of flags for hostcc
  x86: mlpdsp: mlp_filter_channel_x86 requires inline asm

Conflicts:
libavcodec/x86/fft_init.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/proresdsp_init.c
libavutil/x86/float_dsp_init.c
libswscale/utils.c
libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacpsy: use exp2(f) instead of pow(f)(2,...)
Michael Niedermayer [Sun, 9 Sep 2012 10:59:55 +0000 (12:59 +0200)]
aacpsy: use exp2(f) instead of pow(f)(2,...)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: use exp2 instead of pow(2, ...)
Michael Niedermayer [Sun, 9 Sep 2012 10:59:11 +0000 (12:59 +0200)]
ffprobe: use exp2 instead of pow(2, ...)

6 years agoimc: use exp2 instead of pow(2,...)
Michael Niedermayer [Sun, 9 Sep 2012 10:58:43 +0000 (12:58 +0200)]
imc: use exp2 instead of pow(2,...)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/samplefmt: fix/clarify documentation for av_samples_fill_arrays()
Stefano Sabatini [Fri, 7 Sep 2012 23:18:09 +0000 (01:18 +0200)]
lavu/samplefmt: fix/clarify documentation for av_samples_fill_arrays()

In particular, avoid improper use of the term "channels" in place of
"planes", and fix erroneous documentation for the linesize parameter.

6 years agolavu/samplefmt: add note regarding buf validity in av_samples_fill_arrays() doxy
Stefano Sabatini [Fri, 7 Sep 2012 23:19:37 +0000 (01:19 +0200)]
lavu/samplefmt: add note regarding buf validity in av_samples_fill_arrays() doxy

6 years agolavfi: drop deprecated and pointless avfilter_default_end_frame() function
Stefano Sabatini [Fri, 7 Sep 2012 09:21:06 +0000 (11:21 +0200)]
lavfi: drop deprecated and pointless avfilter_default_end_frame() function

Fix warning when compiling boxblur.

While this is technically a major API break, practically there will be no
one using that function since the filtering API is mostly private, so
that function alone is not usable.

6 years agodsputil/me/pixels: Actually use av_restrict
Derek Buitenhuis [Fri, 7 Sep 2012 13:39:12 +0000 (09:39 -0400)]
dsputil/me/pixels: Actually use av_restrict

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4videodec: Fix "warning: dc_pred_dir may be used uninitialized in this function"
Michael Niedermayer [Sun, 9 Sep 2012 01:15:46 +0000 (03:15 +0200)]
mpeg4videodec: Fix "warning: dc_pred_dir may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosmush: read subversion for version==1 too.
Michael Niedermayer [Sun, 9 Sep 2012 00:36:57 +0000 (02:36 +0200)]
smush: read subversion for version==1 too.

This avoids a gcc warning, otherwise it should have no effect.
its a bit more consistent too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: add av_cold to init/free functions
Michael Niedermayer [Sun, 9 Sep 2012 00:26:20 +0000 (02:26 +0200)]
swr: add av_cold to init/free functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: Provide the right alignment for external mmx asm
Martin Storsjö [Sat, 8 Sep 2012 22:43:53 +0000 (01:43 +0300)]
swscale: Provide the right alignment for external mmx asm

This reverts parts of e0c6cce4472. There is external mmx asm that
requires this alignment.

This fixes crashes when using swscale in builds with external mmx,
without inline assembly.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodct-test: fix order of evaluation bug
Michael Niedermayer [Sat, 8 Sep 2012 21:57:37 +0000 (23:57 +0200)]
dct-test: fix order of evaluation bug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: fix order of evaluation bugs
Michael Niedermayer [Sat, 8 Sep 2012 21:56:26 +0000 (23:56 +0200)]
ffserver: fix order of evaluation bugs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr/auto_matrix: treat a single channel as mono instead of failing
Michael Niedermayer [Sat, 8 Sep 2012 19:18:47 +0000 (21:18 +0200)]
swr/auto_matrix: treat a single channel as mono instead of failing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr/auto_matrix: treat stereo downmix like stereo.
Michael Niedermayer [Sat, 8 Sep 2012 19:11:45 +0000 (21:11 +0200)]
swr/auto_matrix: treat stereo downmix like stereo.

Based on code by John Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr/auto_matrix: add clean layout function
Michael Niedermayer [Sat, 8 Sep 2012 19:10:19 +0000 (21:10 +0200)]
swr/auto_matrix: add clean layout function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr/auto_matrix: move layouts to local variables
Michael Niedermayer [Sat, 8 Sep 2012 18:55:15 +0000 (20:55 +0200)]
swr/auto_matrix: move layouts to local variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: Replace checks for CPU extensions and flags by convenience macros
Diego Biurrun [Wed, 29 Aug 2012 17:01:05 +0000 (19:01 +0200)]
x86: Replace checks for CPU extensions and flags by convenience macros

This separates code relying on inline from that relying on external
assembly and fixes instances where the coalesced check was incorrect.

6 years agorandom_seed: Replace a VLA with a normal array
Derek Buitenhuis [Sat, 8 Sep 2012 12:31:33 +0000 (08:31 -0400)]
random_seed: Replace a VLA with a normal array

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: msvc: fix/simplify setting of flags for hostcc
Mans Rullgard [Fri, 7 Sep 2012 10:13:36 +0000 (11:13 +0100)]
configure: msvc: fix/simplify setting of flags for hostcc

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: mlpdsp: mlp_filter_channel_x86 requires inline asm
Hendrik Leppkes [Sat, 8 Sep 2012 06:40:19 +0000 (08:40 +0200)]
x86: mlpdsp: mlp_filter_channel_x86 requires inline asm

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoyuv4mpeg: fix potential alignment bug
Michael Niedermayer [Sat, 8 Sep 2012 11:37:35 +0000 (13:37 +0200)]
yuv4mpeg: fix potential alignment bug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 8 Sep 2012 10:53:44 +0000 (12:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov_chan: Only set the channel_layout if setting it to a nonzero value
  mov_chan: Reindent an incorrectly indented line
  mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
  x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
  x86: more specific checks for availability of required assembly capabilities
  x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
  fate: Drop redundant setting of FUZZ to 1
  cavsdsp: set idct permutation independently of dsputil
  x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov

Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/mp3enc.c

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