ffmpeg.git
6 years agoswr: small align cosmetic.
Clément Bœsch [Sat, 30 Jun 2012 09:18:45 +0000 (11:18 +0200)]
swr: small align cosmetic.

6 years agoswr: use __asm__ instead of __asm.
Clément Bœsch [Sat, 30 Jun 2012 09:18:05 +0000 (11:18 +0200)]
swr: use __asm__ instead of __asm.

For consistency only.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 29 Jun 2012 21:24:58 +0000 (23:24 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  file: Only include unistd.h if it exists
  random_seed: Only read /dev/*random if we have unistd.h
  doc: Indicate that RTMPT is natively implemented in libavformat
  rtpdec: Don't explicitly include unistd.h any longer

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: group together and vertically align correlated parameters in log function
Stefano Sabatini [Thu, 28 Jun 2012 21:51:19 +0000 (23:51 +0200)]
ffplay: group together and vertically align correlated parameters in log function

Possibly improve readability.

6 years agoffplay: vertially align complex if condition in audio_decode_frame()
Stefano Sabatini [Thu, 28 Jun 2012 21:50:35 +0000 (23:50 +0200)]
ffplay: vertially align complex if condition in audio_decode_frame()

Possibly improve readability.

6 years agoffplay: move assignment in else block in audio_decode_frame()
Stefano Sabatini [Thu, 28 Jun 2012 21:48:49 +0000 (23:48 +0200)]
ffplay: move assignment in else block in audio_decode_frame()

Avoid confusing and pointless double assignment of variable
resampled_data_size.

6 years agoffplay: split overly long line in audio_decode_frame()
Stefano Sabatini [Tue, 26 Jun 2012 14:22:22 +0000 (16:22 +0200)]
ffplay: split overly long line in audio_decode_frame()

6 years agopngdsp: Fix license header
Michael Niedermayer [Fri, 29 Jun 2012 10:17:10 +0000 (12:17 +0200)]
pngdsp: Fix license header

Libav did not exist in 2008 thus this file cannot have originated from there

Reviewed-by: Paul B Mahol <onemda@gmail.com>
6 years agoprores: Fix license header
Michael Niedermayer [Fri, 29 Jun 2012 10:18:25 +0000 (12:18 +0200)]
prores: Fix license header

Libav did not exist in 2010 thus the file cannot originate from there

Reviewed-by: Paul B Mahol <onemda@gmail.com>
6 years agowma_common: Fix license header
Michael Niedermayer [Fri, 29 Jun 2012 10:19:37 +0000 (12:19 +0200)]
wma_common: Fix license header

common wma code existed long before Libav

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRealText demuxer and decoder.
Clément Bœsch [Sun, 17 Jun 2012 09:43:34 +0000 (11:43 +0200)]
RealText demuxer and decoder.

6 years agoSAMI demuxer and decoder.
Clément Bœsch [Sun, 17 Jun 2012 09:42:47 +0000 (11:42 +0200)]
SAMI demuxer and decoder.

6 years agolavf/subtitles: add some SMIL helpers.
Clément Bœsch [Sun, 17 Jun 2012 09:43:09 +0000 (11:43 +0200)]
lavf/subtitles: add some SMIL helpers.

This is needed for SAMI and RealText demuxers.

6 years agofate: add JacoSUB and MicroDVD subtitles tests.
Clément Bœsch [Fri, 15 Jun 2012 17:10:48 +0000 (19:10 +0200)]
fate: add JacoSUB and MicroDVD subtitles tests.

6 years agofate: introduce subtitles.mak and move SubRip test in it.
Clément Bœsch [Fri, 15 Jun 2012 17:08:28 +0000 (19:08 +0200)]
fate: introduce subtitles.mak and move SubRip test in it.

6 years agolavc/microdvddec: support "DEFAULT" properties.
Clément Bœsch [Fri, 15 Jun 2012 17:05:34 +0000 (19:05 +0200)]
lavc/microdvddec: support "DEFAULT" properties.

6 years agolavc/ass: honor Default style.
Clément Bœsch [Fri, 15 Jun 2012 17:02:41 +0000 (19:02 +0200)]
lavc/ass: honor Default style.

The "Default" style written in the header is ignored unless you explicit
it in the Dialogue events (it was valid, just ignored). This requires an
update of the SubRip test since the ASS output obviously changes.

6 years agolavf/microdvd: rewrite using subtitles queue API.
Clément Bœsch [Fri, 15 Jun 2012 16:59:52 +0000 (18:59 +0200)]
lavf/microdvd: rewrite using subtitles queue API.

6 years agolavf/jacosubdec: fix FPE in case timeres is badly set.
Clément Bœsch [Fri, 29 Jun 2012 17:38:09 +0000 (19:38 +0200)]
lavf/jacosubdec: fix FPE in case timeres is badly set.

6 years agolavf/jacosubdec: use subtitles queue API.
Clément Bœsch [Fri, 15 Jun 2012 16:57:39 +0000 (18:57 +0200)]
lavf/jacosubdec: use subtitles queue API.

6 years agolavf: add internal demuxer helpers for subtitles.
Clément Bœsch [Fri, 22 Jun 2012 19:56:30 +0000 (21:56 +0200)]
lavf: add internal demuxer helpers for subtitles.

6 years agoffmpeg: fix a memleak in subtitles decoding.
Clément Bœsch [Fri, 22 Jun 2012 20:15:24 +0000 (22:15 +0200)]
ffmpeg: fix a memleak in subtitles decoding.

6 years agolavf/segment: rename segment private context from "c" to "seg" in segment_start()
Stefano Sabatini [Fri, 13 Jan 2012 22:27:09 +0000 (23:27 +0100)]
lavf/segment: rename segment private context from "c" to "seg" in segment_start()

Consistent with the rest of the file, less confusing.

6 years agolavf/segment: add stream_segment variant of the segment muxer
Stefano Sabatini [Fri, 13 Jan 2012 14:38:13 +0000 (15:38 +0100)]
lavf/segment: add stream_segment variant of the segment muxer

This simplifies usage for segment streaming formats with no global
headers, tipically MPEG 2 transport stream "ts" files.

The seg class duplication is required in order to avoid an infinite loop
in libavformat/utils.c:format_child_next_class().

6 years agolavf: allow multiple names in output devices selected by av_guess_format()
Stefano Sabatini [Fri, 13 Jan 2012 10:09:43 +0000 (11:09 +0100)]
lavf: allow multiple names in output devices selected by av_guess_format()

Consistent with av_find_input_format().

6 years agoavformat: disable seeking on FIFOs/named pipes
Martin Sliwka [Thu, 28 Jun 2012 17:31:04 +0000 (19:31 +0200)]
avformat: disable seeking on FIFOs/named pipes

Patch is addition to my previous patch
(https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2012-June/051590.html)
and disables seeking on FIFOs/named pipes by setting
URLContext::is_streamed (same as pipe: protocol does for stdin/stdout pipes)

Fixes Ticket986

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocosmetics: minor libavcodec spelling errors
Lou Logan [Thu, 28 Jun 2012 20:01:06 +0000 (12:01 -0800)]
cosmetics: minor libavcodec spelling errors

Also update some common misspelled words in patcheck

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>
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>
6 years agolavf/segment: add some debugging logs
Stefano Sabatini [Thu, 12 Jan 2012 22:24:27 +0000 (23:24 +0100)]
lavf/segment: add some debugging logs

6 years agolavf/segment: fix command with missing -list option
Stefano Sabatini [Sat, 14 Jan 2012 01:50:33 +0000 (02:50 +0100)]
lavf/segment: fix command with missing -list option

Replace -list with the correct option -segment_list.

6 years agolavf/applehttp: add log message in case of applehttp_read_header() failure
Stefano Sabatini [Sat, 14 Jan 2012 01:49:38 +0000 (02:49 +0100)]
lavf/applehttp: add log message in case of applehttp_read_header() failure

Improve error reporting.

6 years agodoc: Indicate that RTMPT is natively implemented in libavformat
Samuel Pitoiset [Fri, 29 Jun 2012 12:18:41 +0000 (14:18 +0200)]
doc: Indicate that RTMPT is natively implemented in libavformat

Signed-off-by: Martin Storsjö <martin@martin.st>
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>
6 years agodca: favor native over ffmpeg in table name
Michael Niedermayer [Fri, 29 Jun 2012 11:29:07 +0000 (13:29 +0200)]
dca: favor native over ffmpeg in table name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: avoid useless NULL checks in swr_free()
Stefano Sabatini [Thu, 28 Jun 2012 21:52:28 +0000 (23:52 +0200)]
ffplay: avoid useless NULL checks in swr_free()

swr_free() already checks for nullness, no need to add the check in
calling code.

6 years agoffplay: fix wrong reference to function in audio_decode_frame() comment
Stefano Sabatini [Thu, 28 Jun 2012 21:47:06 +0000 (23:47 +0200)]
ffplay: fix wrong reference to function in audio_decode_frame() comment

The comment now references swr_convert(), rather than audio_convert(),
which was deprecated and/or dropped.

6 years agoavutil: fix project name reference in doxy section
Michael Niedermayer [Fri, 29 Jun 2012 09:33:38 +0000 (11:33 +0200)]
avutil: fix project name reference in doxy section

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodca: fix project reference in table name
Michael Niedermayer [Fri, 29 Jun 2012 09:31:37 +0000 (11:31 +0200)]
dca: fix project reference in table name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_ass: fix table name to refer to correct lib.
Michael Niedermayer [Fri, 29 Jun 2012 09:28:34 +0000 (11:28 +0200)]
vf_ass: fix table name to refer to correct lib.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoformats.h: fix project reference in comment
Michael Niedermayer [Fri, 29 Jun 2012 09:26:18 +0000 (11:26 +0200)]
formats.h: fix project reference in comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopixdesc: fix project reference in comment
Michael Niedermayer [Fri, 29 Jun 2012 09:23:56 +0000 (11:23 +0200)]
pixdesc: fix project reference in comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoReplace Libav with FFmpeg in license headers for files created by me
Paul B Mahol [Fri, 29 Jun 2012 01:55:56 +0000 (01:55 +0000)]
Replace Libav with FFmpeg in license headers for files created by me

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agogit-howto: replace confusing and incorrect text about he testsuite by mostly a correc...
Michael Niedermayer [Thu, 28 Jun 2012 23:13:16 +0000 (01:13 +0200)]
git-howto: replace confusing and incorrect text about he testsuite by mostly a correct text.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogit-howto: partial rewrite of the push checklist to make it match sanity & reality.
Michael Niedermayer [Thu, 28 Jun 2012 23:06:12 +0000 (01:06 +0200)]
git-howto: partial rewrite of the push checklist to make it match sanity & reality.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogit-howto: remove inconvenient and odd 24h limit on rsync
Michael Niedermayer [Thu, 28 Jun 2012 22:33:49 +0000 (00:33 +0200)]
git-howto: remove inconvenient and odd 24h limit on rsync

This was never true for FFmpeg in this form.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMakefile: remove checkheaders from the main check target
Michael Niedermayer [Thu, 28 Jun 2012 22:05:40 +0000 (00:05 +0200)]
Makefile: remove checkheaders from the main check target

checkheaders doesnt pass and noone has even noticed since a very
long time.

checkheaders is also unmaintained (please add yourself to MAINTAINERS
if you want to maintain it)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogit-howto: cleanup, remove unreasonable recommendition.
Michael Niedermayer [Thu, 28 Jun 2012 22:03:12 +0000 (00:03 +0200)]
git-howto: cleanup, remove unreasonable recommendition.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 28 Jun 2012 21:57:31 +0000 (23:57 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flv: add support for G.711
  doc: git: Add checklist with test steps to perform before pushing
  flvenc: K&R formatting cosmetics
  movenc: Add channel layouts for PCM.

Conflicts:
libavformat/flvenc.c
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: simplify code by using avfilter_unref_bufferp()
Stefano Sabatini [Tue, 26 Jun 2012 13:17:24 +0000 (15:17 +0200)]
ffplay: simplify code by using avfilter_unref_bufferp()

6 years agolavfi: deprecate av_buffersrc_buffer() function
Stefano Sabatini [Tue, 26 Jun 2012 13:52:32 +0000 (15:52 +0200)]
lavfi: deprecate av_buffersrc_buffer() function

Favor av_buffersrc_add_ref() instead, which is more powerful.

6 years agoGenerate channel layout, reordering for DTS-XXCH extension and, undo embedded downmixes
Nick Brereton [Wed, 20 Jun 2012 19:52:46 +0000 (20:52 +0100)]
Generate channel layout, reordering for DTS-XXCH extension and, undo embedded downmixes

Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoParse & decode DTS XXCH frames
Nick Brereton [Wed, 20 Jun 2012 19:52:46 +0000 (20:52 +0100)]
Parse & decode DTS XXCH frames

Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Fix maximum reference count check for non-b frames
Jeff Downs [Thu, 28 Jun 2012 16:47:10 +0000 (12:47 -0400)]
h264: Fix maximum reference count check for non-b frames

Below fixes the maximum reference count check for second reference list in
non-B frames.  There is nothing to prohibit full (field sized) reference
list in this case as far as I can tell, and this fixes several syntax-test
files here (this is a regression caused when this check was made more
stringent by
http://git.videolan.org/?p=ffmpeg.git;a=commit;h=dc9ce40069bde3d28f8d0b3e5bd733ae255fecb5)

Probably a silly corner case seldom seen irl, but thought I'd pass along
in case there was interest in correcting the check.

---------------

h264: Fix maximum reference count check for non-b frames; full range is
technically ok

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: warn that -t does not work with -filter_complex.
Nicolas George [Thu, 28 Jun 2012 19:02:31 +0000 (21:02 +0200)]
ffmpeg: warn that -t does not work with -filter_complex.

6 years agoffmpeg: warn when -t is used for inputs.
Nicolas George [Thu, 28 Jun 2012 18:26:13 +0000 (20:26 +0200)]
ffmpeg: warn when -t is used for inputs.

Using -t on an input already have surprising results.
Furthermore, using it on an input or an output makes
a real difference if there are speed-altering filters.

Implementing -t for inputs will probably result in some
behavour changes.

6 years agosink_buffer: warn when there are too many buffers.
Nicolas George [Thu, 28 Jun 2012 09:21:42 +0000 (11:21 +0200)]
sink_buffer: warn when there are too many buffers.

6 years agobuffersrc: warn when there are too many buffers.
Nicolas George [Thu, 28 Jun 2012 09:21:18 +0000 (11:21 +0200)]
buffersrc: warn when there are too many buffers.

6 years agolavfi/amerge: silence warnings
Paul B Mahol [Thu, 28 Jun 2012 16:51:17 +0000 (16:51 +0000)]
lavfi/amerge: silence warnings

The warning silenced was: libavfilter/af_amerge.c:144:29: warning: conversion specifies type 'long long' but the argument has type 'int' [-Wformat]

The warning was introduced after FF_API_SAMPLERATE64 removal.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoparseutils: fix sorting of colors
Paul B Mahol [Thu, 28 Jun 2012 17:15:08 +0000 (17:15 +0000)]
parseutils: fix sorting of colors

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffmpeg: dont copy creation_time as the destination file is not created at that time
Michael Niedermayer [Thu, 28 Jun 2012 15:09:36 +0000 (17:09 +0200)]
ffmpeg: dont copy creation_time as the destination file is not created at that time

Fixes Ticket1439

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflv: add support for G.711
Damien Fetis [Thu, 28 Jun 2012 14:28:56 +0000 (16:28 +0200)]
flv: add support for G.711

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodoc: git: Add checklist with test steps to perform before pushing
Diego Biurrun [Mon, 14 May 2012 15:08:00 +0000 (17:08 +0200)]
doc: git: Add checklist with test steps to perform before pushing

6 years agoflvenc: K&R formatting cosmetics
Luca Barbato [Wed, 27 Jun 2012 08:16:18 +0000 (10:16 +0200)]
flvenc: K&R formatting cosmetics

6 years agoswr: fix compilation with ancient toolchain that doesnt support SSSE3
Michael Niedermayer [Thu, 28 Jun 2012 09:12:41 +0000 (11:12 +0200)]
swr: fix compilation with ancient toolchain that doesnt support SSSE3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoudp: use av_freep() instead of av_free()
Michael Niedermayer [Wed, 27 Jun 2012 23:09:43 +0000 (01:09 +0200)]
udp: use av_freep() instead of av_free()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: add proper enum type for fmt ctx duration esitmation method
Michael Bradshaw [Fri, 22 Jun 2012 23:03:18 +0000 (17:03 -0600)]
lavf: add proper enum type for fmt ctx duration esitmation method

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 27 Jun 2012 22:42:47 +0000 (00:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mss1: validate number of changeable palette entries
  mss1: report palette changed when some additional colours were decoded
  x86: fft: replace call to memcpy by a loop
  udp: Support IGMPv3 source specific multicast and source blocking
  dxva2: include dxva.h if found
  libm: Provide fallback definitions for isnan() and isinf()
  tcp: Pass NULL as hostname to getaddrinfo if the string is empty
  tcp: Set AI_PASSIVE when the socket will be used for listening

Conflicts:
configure
libavcodec/mss1.c
libavformat/udp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolog: change color for filters from blue to bright green
Michael Niedermayer [Wed, 20 Jun 2012 15:17:50 +0000 (17:17 +0200)]
log: change color for filters from blue to bright green

The blue is difficult to read on several peoples terminals with black background.

Idea-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: MMX2 & SSSE3 int16 resample core
Michael Niedermayer [Tue, 19 Jun 2012 01:08:19 +0000 (03:08 +0200)]
swr: MMX2 & SSSE3 int16 resample core

about 4 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: try to detect live akamai streams and dont enable seeking for them
Michael Niedermayer [Sun, 3 Jun 2012 16:34:53 +0000 (18:34 +0200)]
http: try to detect live akamai streams and dont enable seeking for them

Fixes ticket1320

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolsp: use av_assert
Michael Niedermayer [Wed, 27 Jun 2012 22:07:22 +0000 (00:07 +0200)]
lsp: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolpc: use av_assert
Michael Niedermayer [Wed, 27 Jun 2012 22:07:10 +0000 (00:07 +0200)]
lpc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoudp: fix occasional crash on shutdown
Eric Petit [Wed, 27 Jun 2012 13:09:40 +0000 (15:09 +0200)]
udp: fix occasional crash on shutdown

Wait until the thread is down before destroying the fifo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: Add channel layouts for PCM.
Alex Converse [Sat, 23 Jun 2012 23:57:56 +0000 (16:57 -0700)]
movenc: Add channel layouts for PCM.

6 years agolavc: clarify docs for avpkt->destruct
Michael Bradshaw [Wed, 27 Jun 2012 18:19:00 +0000 (12:19 -0600)]
lavc: clarify docs for avpkt->destruct

avcodec_encode_audio2 docs are ambiguous about avpkt->destruct and imply
it gets reset.

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomss1: validate number of changeable palette entries
Kostya Shishkov [Wed, 27 Jun 2012 08:11:19 +0000 (10:11 +0200)]
mss1: validate number of changeable palette entries

6 years agomss1: report palette changed when some additional colours were decoded
Kostya Shishkov [Wed, 27 Jun 2012 08:07:47 +0000 (10:07 +0200)]
mss1: report palette changed when some additional colours were decoded

6 years agox86: fft: replace call to memcpy by a loop
Christophe Gisquet [Tue, 26 Jun 2012 14:10:33 +0000 (16:10 +0200)]
x86: fft: replace call to memcpy by a loop

The function call was a mess to handle, and memcpy cannot make
the assumptions we do in the new code.

Tested on an IMC sample: 430c -> 370c.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoudp: Support IGMPv3 source specific multicast and source blocking
Martin Storsjö [Thu, 21 Jun 2012 11:19:56 +0000 (14:19 +0300)]
udp: Support IGMPv3 source specific multicast and source blocking

Based on an original patch by Stephen D'Angelo <SDAngelo@evertz.com>.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodxva2: include dxva.h if found
Ronald S. Bultje [Sun, 24 Jun 2012 10:17:13 +0000 (11:17 +0100)]
dxva2: include dxva.h if found

Apparently, some build environments require dxva.h even for dxva2,
while others lack this header entirely.  Including it conditionally
allows building in both cases.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibm: Provide fallback definitions for isnan() and isinf()
Martin Storsjö [Tue, 26 Jun 2012 16:22:12 +0000 (19:22 +0300)]
libm: Provide fallback definitions for isnan() and isinf()

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agotcp: Pass NULL as hostname to getaddrinfo if the string is empty
Jordi Ortiz [Tue, 26 Jun 2012 17:22:21 +0000 (19:22 +0200)]
tcp: Pass NULL as hostname to getaddrinfo if the string is empty

This gives you the proper v4 or v6 version of the "any address",
allowing receiving connections on any address on the machine.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agotcp: Set AI_PASSIVE when the socket will be used for listening
Jordi Ortiz [Tue, 26 Jun 2012 17:21:11 +0000 (19:21 +0200)]
tcp: Set AI_PASSIVE when the socket will be used for listening

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 26 Jun 2012 23:58:09 +0000 (01:58 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: add an assert to silence an uninitialized variable warning.
  avconv: shut up an uninitialized variable warning.
  avfiltergraph: shut up uninitialized variable warning.
  af_join: initialize a variable to shut up gcc warning.
  amix: fix format specifier for AVFilterLink.sample_rate.
  lavfi: make filters less verbose.
  mpc8: read APE tags.
  lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes
  libm: provide fallback definition for cbrtf() using powf()
  network: Don't redefine error codes if they already exist in errno.h
  configure: Check for sys/time.h
  network: Include unistd.h from network.h
  avconv: don't include vsrc_buffer.h, which doesn't exist anymore
  lavfi: reorder AVFilterLink fields.
  lavfi: reorder AVFilterContext fields.
  lavfi: reorder AVFilter fields.
  lavfi: reorder AVFilterBufferRef fields.
  lavfi: reorder AVFilterBuffer fields.

Conflicts:
configure
libavcodec/v210dec.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_crop.c
libavfilter/vf_drawbox.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vsrc_color.c
libavformat/network.h
libavutil/libm.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'
Michael Niedermayer [Tue, 26 Jun 2012 22:34:36 +0000 (00:34 +0200)]
Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'

* commit '1961e46c15c23a041f8d8614a25388a3ee9eff63':
  lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft
  lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft
  lavfi: use proper FF_API guards for different deprecated functions
  lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft
  lavfi: remove disabled FF_API_SAMPLERATE64 cruft
  lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft

Conflicts:
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/formats.c
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/video.c
libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'
Michael Niedermayer [Tue, 26 Jun 2012 21:27:59 +0000 (23:27 +0200)]
Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

* commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a':
  lavfi: remove 'opaque' parameter from AVFilter.init()
  mov: do not try to read total disc/track number if data atom is too short.
  avconv: fix -force_key_frames
  dxva2_h264: fix signaling of mbaff frames
  x86: fft: elf64: fix PIC build

Conflicts:
ffmpeg.c
libavcodec/v210dec.h
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavconv: add an assert to silence an uninitialized variable warning.
Anton Khirnov [Mon, 25 Jun 2012 11:19:51 +0000 (13:19 +0200)]
avconv: add an assert to silence an uninitialized variable warning.

The warning silenced was:
avconv.c: In function ‘opt_output_file’:
avconv.c:3380:21: warning: ‘meta_out’ may be used uninitialized in this function [-Wuninitialized]
avconv.c:3315:20: note: ‘meta_out’ was declared here

6 years agoavconv: shut up an uninitialized variable warning.
Anton Khirnov [Mon, 25 Jun 2012 11:16:57 +0000 (13:16 +0200)]
avconv: shut up an uninitialized variable warning.

The warning silenced was:
avconv.c: In function ‘configure_filtergraph’:
avconv.c:603:8: warning: ‘ist’ may be used uninitialized in this function [-Wuninitialized]
avconv.c:549:18: note: ‘ist’ was declared here

6 years agoavfiltergraph: shut up uninitialized variable warning.
Anton Khirnov [Mon, 25 Jun 2012 11:01:31 +0000 (13:01 +0200)]
avfiltergraph: shut up uninitialized variable warning.

The warning silenced was:
libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’:
libavfilter/avfiltergraph.c:500:13: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized]

6 years agoaf_join: initialize a variable to shut up gcc warning.
Anton Khirnov [Mon, 25 Jun 2012 10:57:16 +0000 (12:57 +0200)]
af_join: initialize a variable to shut up gcc warning.

The warning silenced was:
libavfilter/af_join.c: In function ‘join_request_frame’:
libavfilter/af_join.c:451:9: warning: ‘nb_samples’ may be used uninitialized in this function [-Wuninitialized]

6 years agoamix: fix format specifier for AVFilterLink.sample_rate.
Anton Khirnov [Mon, 25 Jun 2012 10:53:18 +0000 (12:53 +0200)]
amix: fix format specifier for AVFilterLink.sample_rate.

It is a plain int now.

6 years agolavfi: make filters less verbose.
Anton Khirnov [Mon, 25 Jun 2012 04:31:38 +0000 (06:31 +0200)]
lavfi: make filters less verbose.

6 years agompc8: read APE tags.
Anton Khirnov [Fri, 22 Jun 2012 18:48:40 +0000 (20:48 +0200)]
mpc8: read APE tags.

6 years agoexamples/filtering: fix packet memleak
Gavin Kinsey [Tue, 26 Jun 2012 17:00:30 +0000 (19:00 +0200)]
examples/filtering: fix packet memleak

Free packets unconditionally after demuxing, and not only when the
packets belong to a given stream.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoexamples/filtering_video: update to the new API
Gavin Kinsey [Tue, 26 Jun 2012 08:16:16 +0000 (09:16 +0100)]
examples/filtering_video: update to the new API

Update the video filtering example program based on the audio one.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes
Justin Ruggles [Wed, 2 May 2012 20:44:54 +0000 (16:44 -0400)]
lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes

Changed to match the number of parameters in conv_func_interleave(), which is
how they are called. The change isn't strictly necessary because the 4th
parameter is not used, but the code is clearer if they match.

6 years agolibm: provide fallback definition for cbrtf() using powf()
Mans Rullgard [Fri, 22 Jun 2012 14:37:46 +0000 (15:37 +0100)]
libm: provide fallback definition for cbrtf() using powf()

This adds a fallback for cbrtf() using powf(x, 1/3).  Since
powf() with a non-integer exponent requires a non-negative
base, special handling of negative inputs is needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agonetwork: Don't redefine error codes if they already exist in errno.h
Ronald S. Bultje [Sat, 23 Jun 2012 12:00:17 +0000 (15:00 +0300)]
network: Don't redefine error codes if they already exist in errno.h

Since the errno.h values don't match the error codes that winsock
returns, map the winsock error codes to the errno ones, to make
sure explicit checks against AVERROR(x) match.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: Check for sys/time.h
Ronald S. Bultje [Sun, 24 Jun 2012 19:20:21 +0000 (22:20 +0300)]
configure: Check for sys/time.h

Apparently this include is needed on some systems for building the
poll fallback (for the timeval struct for select?), but it isn't
available on all systems. Thus only include it if it exists.

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