ffmpeg.git
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>
6 years agoffio_read: dont spam the user at EOF with a truncation error
Michael Niedermayer [Sat, 8 Sep 2012 10:08:25 +0000 (12:08 +0200)]
ffio_read: dont spam the user at EOF with a truncation error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflashsv2enc: only encode diff blocks when needed
Daniel Verkamp [Sat, 8 Sep 2012 02:43:56 +0000 (19:43 -0700)]
flashsv2enc: only encode diff blocks when needed

A flashsv2 block may have a "diff block" to indicate which scan lines of
the block are actually encoded.  However, this diff block need not be
used when the entire block is coded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: Fix potential memory leak in mpegts_read_packet()
Michael Niedermayer [Sat, 8 Sep 2012 02:32:25 +0000 (04:32 +0200)]
mpegts: Fix potential memory leak in mpegts_read_packet()

This leak can happen in case of some error paths.

Found-by: Tanami, Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavio: replace ETIMEDOUT by EIO
Michael Niedermayer [Wed, 5 Sep 2012 22:30:58 +0000 (00:30 +0200)]
avio: replace ETIMEDOUT by EIO

ETIMEDOUT is not available on all platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov_chan: Only set the channel_layout if setting it to a nonzero value
Martin Storsjö [Fri, 7 Sep 2012 07:45:16 +0000 (10:45 +0300)]
mov_chan: Only set the channel_layout if setting it to a nonzero value

If regularly parsing new chan atoms (as in rtpdec_qt), but the
chan atoms don't actually contain any channel layout, don't reset
the value that the caller has filled in (by guessing).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomov_chan: Reindent an incorrectly indented line
Martin Storsjö [Fri, 7 Sep 2012 07:41:37 +0000 (10:41 +0300)]
mov_chan: Reindent an incorrectly indented line

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomp2 muxer: mark as AVFMT_NOTIMESTAMPS.
Carl Eugen Hoyos [Sun, 28 Aug 2011 17:43:04 +0000 (19:43 +0200)]
mp2 muxer: mark as AVFMT_NOTIMESTAMPS.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
6 years agoflashsv2enc: remove experimental flag, the encoder seems working now
Michael Niedermayer [Fri, 7 Sep 2012 20:53:21 +0000 (22:53 +0200)]
flashsv2enc: remove experimental flag, the encoder seems working now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibswr: remove redundant ARCH_X86, MMX* implicates X86
Michael Niedermayer [Fri, 7 Sep 2012 20:31:37 +0000 (22:31 +0200)]
libswr: remove redundant ARCH_X86, MMX* implicates X86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswsresample: Fix unprotected inline asm
Derek Buitenhuis [Fri, 7 Sep 2012 14:48:28 +0000 (10:48 -0400)]
swsresample: Fix unprotected inline asm

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_mp: Do not build if inline assembly is not available
Derek Buitenhuis [Fri, 7 Sep 2012 17:58:26 +0000 (13:58 -0400)]
vf_mp: Do not build if inline assembly is not available

Rather than modify the mplayer filter sources, just disable
vf_mp if inline assembly is not available.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: Change WINBOOL to BOOL
Derek Buitenhuis [Fri, 7 Sep 2012 12:16:30 +0000 (08:16 -0400)]
dshow: Change WINBOOL to BOOL

WINBOOL is MinGW-specific, and since both MSVC and MinGW
have BOOL, use that instead.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflashsv2enc: move blockbuffer realloc to reconfigure_at_keyframe()
Michael Niedermayer [Fri, 7 Sep 2012 19:28:29 +0000 (21:28 +0200)]
flashsv2enc: move blockbuffer realloc to reconfigure_at_keyframe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflashv2enc: reallocate not only on block count changes but on dimension changes.
Michael Niedermayer [Fri, 7 Sep 2012 19:24:33 +0000 (21:24 +0200)]
flashv2enc: reallocate not only on block count changes but on dimension changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflashsv2enc: Replace a VLA with a heap alloc
Derek Buitenhuis [Fri, 7 Sep 2012 14:38:15 +0000 (10:38 -0400)]
flashsv2enc: Replace a VLA with a heap alloc

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflashsv2enc: fix prev-Z-prime encoding
Michael Niedermayer [Fri, 7 Sep 2012 19:05:18 +0000 (21:05 +0200)]
flashsv2enc: fix prev-Z-prime encoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
Justin Ruggles [Fri, 3 Aug 2012 21:38:49 +0000 (17:38 -0400)]
x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64

The SWAP macro does not work for explicit xmm/ymm usage, so instead just move
the scalar value from xmm2 to xmm0.

6 years agovf_idet: Remove emms
Derek Buitenhuis [Fri, 7 Sep 2012 17:50:13 +0000 (13:50 -0400)]
vf_idet: Remove emms

There is no MMX code anyway.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoproresdec2: avoid VLA and use SliceContext instead.
Michael Niedermayer [Fri, 7 Sep 2012 17:38:23 +0000 (19:38 +0200)]
proresdec2: avoid VLA and use SliceContext instead.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocache: Only include unistd.h if it exists
Derek Buitenhuis [Fri, 7 Sep 2012 17:20:42 +0000 (13:20 -0400)]
cache: Only include unistd.h if it exists

This follows suite from f3be3597079be7cd7adbb8392c32e408cadd3da2.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofile: Only include unistd.h if it exists
Ronald S. Bultje [Sun, 24 Jun 2012 21:42:27 +0000 (00:42 +0300)]
file: Only include unistd.h if it exists

It is included for the open/read/write/close functions. On
MSVC, where this header does not exist, the same functions
are provided by io.h, which is already included.

On windows, these functions are provided by io.h. Make sure
io.h is included if it exists, regardless of the setmode
function.

Signed-off-by: Martin Storsjö <martin@martin.st>
Conflicts:

configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorandom_seed: Only read /dev/*random if we have unistd.h
Ronald S. Bultje [Sun, 24 Jun 2012 18:26:31 +0000 (21:26 +0300)]
random_seed: Only read /dev/*random if we have unistd.h

unistd.h is used for open/read/close, but if this header does not
exist, there's probably no use in trying to open /dev/*random
at all.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec: Don't explicitly include unistd.h any longer
Ronald S. Bultje [Sun, 24 Jun 2012 18:05:21 +0000 (21:05 +0300)]
rtpdec: Don't explicitly include unistd.h any longer

unistd.h used to be required for gethostname. On windows, gethostname
is provided by winsock2.h. Now network.h includes both unistd.h and
winsock2.h if they exist.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvdec: Remove unused strings.h header
Derek Buitenhuis [Fri, 7 Sep 2012 12:54:21 +0000 (08:54 -0400)]
wtvdec: Remove unused strings.h header

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_colormatrix: Drop unused strings.h header
Derek Buitenhuis [Fri, 7 Sep 2012 12:54:20 +0000 (08:54 -0400)]
vf_colormatrix: Drop unused strings.h header

It already uses av_strcasecmp.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: more specific checks for availability of required assembly capabilities
Diego Biurrun [Tue, 4 Sep 2012 06:30:16 +0000 (08:30 +0200)]
x86: more specific checks for availability of required assembly capabilities

6 years agoMakefile: remove old codec_names.h on distclean
Michael Niedermayer [Fri, 7 Sep 2012 12:58:30 +0000 (14:58 +0200)]
Makefile: remove old codec_names.h on distclean

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogitignore: codec_names.h is no more
Michael Niedermayer [Fri, 7 Sep 2012 12:58:04 +0000 (14:58 +0200)]
gitignore: codec_names.h is no more

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/sdl: decrease debug info notice log level from AV_LOG_INFO to VERBOSE
Stefano Sabatini [Fri, 7 Sep 2012 12:04:04 +0000 (14:04 +0200)]
lavd/sdl: decrease debug info notice log level from AV_LOG_INFO to VERBOSE

Decrease log spam.

6 years agolavd/sdl: remove trailing dot in messages
Stefano Sabatini [Fri, 7 Sep 2012 11:58:31 +0000 (13:58 +0200)]
lavd/sdl: remove trailing dot in messages

This is consistent with the apparently prevailing convention.

6 years agolavf/utils: fix typo in has_codec_parameters
Stefano Sabatini [Fri, 7 Sep 2012 12:27:47 +0000 (14:27 +0200)]
lavf/utils: fix typo in has_codec_parameters

Replace "unspecified sample size" with "unspecified frame size". +10l.

6 years agoimg2dec: Don't leave AVIOContexts open on zero byte files
Tomas Härdin [Fri, 7 Sep 2012 11:28:48 +0000 (13:28 +0200)]
img2dec: Don't leave AVIOContexts open on zero byte files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: avcodec: Drop silly "_mmx" suffix from dsputil template names
Diego Biurrun [Sat, 11 Aug 2012 20:35:27 +0000 (22:35 +0200)]
x86: avcodec: Drop silly "_mmx" suffix from dsputil template names

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Sep 2012 11:37:19 +0000 (13:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov_chan: Pass a separate AVIOContext for reading
  af_asyncts: check return value from lavr when flushing.
  mss2: simplify loop in decode_rle()
  mss12: avoid unnecessary division in arith*_get_bit()
  mss2: do not try to read too many palette entries
  mpegvideo: set AVFrame fields to NULL after freeing the base memory
  configure: Set the right cc_e flags for msvc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: factor codec id forcing out
Michael Niedermayer [Fri, 7 Sep 2012 11:16:04 +0000 (13:16 +0200)]
lavf: factor codec id forcing out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add qp_table_size
Michael Niedermayer [Fri, 7 Sep 2012 11:00:47 +0000 (13:00 +0200)]
lavfi: add qp_table_size

This avoid recalculating it and in case w/h changed avoids crashes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Drop redundant setting of FUZZ to 1
Diego Biurrun [Sun, 26 Aug 2012 11:02:40 +0000 (13:02 +0200)]
fate: Drop redundant setting of FUZZ to 1

6 years agocavsdsp: set idct permutation independently of dsputil
Mans Rullgard [Tue, 4 Sep 2012 12:52:01 +0000 (13:52 +0100)]
cavsdsp: set idct permutation independently of dsputil

CAVS uses its own idct so using dsputil to set the permutation
is fragile.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov
Mans Rullgard [Sun, 2 Sep 2012 15:05:56 +0000 (16:05 +0100)]
x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov

For some reason add_hfyu_median_prediction_cmov is only selected
on 3Dnow-capable CPUs, even though it uses no 3Dnow instructions.
This patch allows it to be selected on any cpu with cmov with the
possibility of being overridden by the mmxext version.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agofaxcompr: fix out of array read
Michael Niedermayer [Fri, 7 Sep 2012 10:35:41 +0000 (12:35 +0200)]
faxcompr: fix out of array read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE
Stefano Sabatini [Thu, 6 Sep 2012 21:20:10 +0000 (23:20 +0200)]
lavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE

AV_LOG_INFO is more geared towards messages to be read by the user, the
statistics shown by libx264 with X264_LOG_INFO are more useful at the
debugging level.

Help reducing the log spam.

6 years agolavd/dshow: use AV_OPT_TYPE_IMAGE_SIZE
Ramiro Polla [Thu, 6 Sep 2012 23:50:06 +0000 (20:50 -0300)]
lavd/dshow: use AV_OPT_TYPE_IMAGE_SIZE

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavd/dshow: support video codec and pixel format selection
Ramiro Polla [Thu, 6 Sep 2012 23:41:19 +0000 (20:41 -0300)]
lavd/dshow: support video codec and pixel format selection

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavu/opt: reindent after last commit
Stefano Sabatini [Fri, 7 Sep 2012 07:39:58 +0000 (09:39 +0200)]
lavu/opt: reindent after last commit

6 years agomov_chan: Pass a separate AVIOContext for reading
Samuel Pitoiset [Thu, 6 Sep 2012 10:46:37 +0000 (12:46 +0200)]
mov_chan: Pass a separate AVIOContext for reading

This fixes crashes when called from rtpdec_qt, where
AVFormatContext->pb is null, a crash present since 3bab7cd128.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoaf_asyncts: check return value from lavr when flushing.
Anton Khirnov [Tue, 4 Sep 2012 20:01:38 +0000 (22:01 +0200)]
af_asyncts: check return value from lavr when flushing.

Fixes an infinite loop on flush when avresample_get_delay() still
reports some samples but avresample_convert() doesn't return any data.

6 years agolavfi: 10l fix () placement
Michael Niedermayer [Fri, 7 Sep 2012 04:53:11 +0000 (06:53 +0200)]
lavfi: 10l fix () placement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: factor copy_video_props() out
Michael Niedermayer [Fri, 7 Sep 2012 01:24:55 +0000 (03:24 +0200)]
lavfi: factor copy_video_props() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter: pass QP table through the filter chain
Michael Niedermayer [Wed, 5 Sep 2012 02:41:22 +0000 (04:41 +0200)]
libavfilter: pass QP table through the filter chain

Any volunteers to port the pp and spp filters from libmpcodec?

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/vp6: Disable deblock filtering for Simple Profile
Ben Jackson [Thu, 6 Sep 2012 21:30:39 +0000 (14:30 -0700)]
lavc/vp6: Disable deblock filtering for Simple Profile

In vp6 Advanced Profile, deblock filtering is conditionally enabled in
each frame header.  In Simple Profile it should always be off.  vp6 was
inheriting the wrong default from ff_vp56_init.

Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd Dolby/DPLII downmix support to libswresample
Michael Niedermayer [Sat, 9 Jun 2012 20:45:49 +0000 (13:45 -0700)]
Add Dolby/DPLII downmix support to libswresample

Based on code by John Stebbins <jstebbins.hb@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: update rematrix coeffs to match AC-3
Michael Niedermayer [Thu, 6 Sep 2012 20:32:39 +0000 (22:32 +0200)]
swr: update rematrix coeffs to match AC-3

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