ffmpeg.git
6 years agoapetag: make sure avio_get_str() doesn't read more than it should.
Anton Khirnov [Tue, 26 Jun 2012 16:49:04 +0000 (18:49 +0200)]
apetag: make sure avio_get_str() doesn't read more than it should.

6 years agomov: read itunes cover art.
Anton Khirnov [Thu, 21 Jun 2012 16:24:27 +0000 (18:24 +0200)]
mov: read itunes cover art.

6 years agosnow: remove VLA in mc_block()
Mans Rullgard [Sun, 1 Jul 2012 14:39:22 +0000 (15:39 +0100)]
snow: remove VLA in mc_block()

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agointfloat: Don't use designated initializers in the public headers
Ronald S. Bultje [Mon, 2 Jul 2012 07:22:30 +0000 (10:22 +0300)]
intfloat: Don't use designated initializers in the public headers

intfloat.h is a public header, and is now (since a1245d5ca) included
by mathematics.h, which many external callers include.

This fixes building third party applications that include
mathematics.h in a language that doesn't support designated
initalizers.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosnow: remove a VLA.
Ronald S. Bultje [Fri, 15 Jun 2012 16:59:57 +0000 (09:59 -0700)]
snow: remove a VLA.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc: Remind devs to check return values, especially for malloc() et al
Diego Biurrun [Sat, 30 Jun 2012 13:35:57 +0000 (15:35 +0200)]
doc: Remind devs to check return values, especially for malloc() et al

6 years agoMS ATC Screen (aka MSS3) decoder
Kostya Shishkov [Thu, 28 Jun 2012 19:18:23 +0000 (21:18 +0200)]
MS ATC Screen (aka MSS3) decoder

6 years agovf_yadif: move x86 init code to x86/yadif.c
Mans Rullgard [Sun, 1 Jul 2012 12:08:17 +0000 (13:08 +0100)]
vf_yadif: move x86 init code to x86/yadif.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agovf_gradfun: move x86 init code to x86/gradfun.c
Mans Rullgard [Sun, 1 Jul 2012 11:51:30 +0000 (12:51 +0100)]
vf_gradfun: move x86 init code to x86/gradfun.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoroqvideo: Remove a totally unused dspcontext
Martin Storsjö [Sun, 1 Jul 2012 20:46:28 +0000 (23:46 +0300)]
roqvideo: Remove a totally unused dspcontext

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosmacker: remove some unused code
Mans Rullgard [Sun, 1 Jul 2012 13:56:16 +0000 (14:56 +0100)]
smacker: remove some unused code

This removes some code apparently left over from vlc reader
debugging.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsicin: remove dead assignment
Mans Rullgard [Sun, 1 Jul 2012 13:28:50 +0000 (14:28 +0100)]
dsicin: remove dead assignment

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoaacdec: remove dead assignment
Mans Rullgard [Sun, 1 Jul 2012 12:50:09 +0000 (13:50 +0100)]
aacdec: remove dead assignment

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agorl2: remove dead assignment
Mans Rullgard [Sun, 1 Jul 2012 12:43:44 +0000 (13:43 +0100)]
rl2: remove dead assignment

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoproresenc: make a variable local to the loop where it is used
Mans Rullgard [Sun, 1 Jul 2012 12:38:12 +0000 (13:38 +0100)]
proresenc: make a variable local to the loop where it is used

This moves the mbs_per_slice declaration inside the only loop
where it is used.  Fixes a dead assignment.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoalsdec: remove dead assignments
Mans Rullgard [Sun, 1 Jul 2012 12:36:30 +0000 (13:36 +0100)]
alsdec: remove dead assignments

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoopt/eval: Include mathematics.h for NAN/INFINITY
Martin Storsjö [Sat, 30 Jun 2012 15:49:33 +0000 (18:49 +0300)]
opt/eval: Include mathematics.h for NAN/INFINITY

These files use NAN/INFINITY but didn't include mathematics.h to get
the fallback definitions if the system lacks the macros.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomathematics: Don't use division by zero in NAN/INFINITY macros
Ronald S. Bultje [Fri, 22 Jun 2012 10:05:21 +0000 (13:05 +0300)]
mathematics: Don't use division by zero in NAN/INFINITY macros

Some compilers, MSVC among them, don't recognize the divisions by
zero as meaning infinity/nan.

These macros should, according to the standard, expand to constant
expressions, but this shouldn't matter for our usage.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agowma: Lower the maximum number of channels to 2
Martin Storsjö [Sat, 30 Jun 2012 18:30:28 +0000 (21:30 +0300)]
wma: Lower the maximum number of channels to 2

ff_wma_init is used only by wmadec and wmaenc, and neither of them
can handle more than 2 channels.

This fixes crashes with invalid files.

Based on patch by Piotr Bandurski and Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: cpu: clean up check for cpuid instruction support
Mans Rullgard [Sun, 24 Jun 2012 11:29:28 +0000 (12:29 +0100)]
x86: cpu: clean up check for cpuid instruction support

This adds macros for accessing the EFLAGS register and uses
these instead of coding the entire check in inline asm.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoARM: generate position independent code to access data symbols
Mans Rullgard [Fri, 29 Jun 2012 12:35:08 +0000 (13:35 +0100)]
ARM: generate position independent code to access data symbols

This creates proper position independent code when accessing
data symbols if CONFIG_PIC is set.

References to external symbols should now use the movrelx macro.
Some additional code changes are required since this macro may
need a register to hold the GOT pointer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
Ronald S. Bultje [Thu, 14 Jun 2012 22:05:10 +0000 (22:05 +0000)]
dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.

6 years agodnxhdenc: add space between function argument type and comment.
Ronald S. Bultje [Thu, 14 Jun 2012 22:57:26 +0000 (15:57 -0700)]
dnxhdenc: add space between function argument type and comment.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
Ronald S. Bultje [Thu, 14 Jun 2012 14:03:08 +0000 (15:03 +0100)]
x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*

This gets rid of a variable-length array and a for loop in C code.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoattributes: Add a definition of av_always_inline for MSVC
Ronald S. Bultje [Sun, 24 Jun 2012 17:57:14 +0000 (20:57 +0300)]
attributes: Add a definition of av_always_inline for MSVC

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocmdutils: Pass the actual chosen encoder to filter_codec_opts
Martin Storsjö [Fri, 29 Jun 2012 22:28:02 +0000 (01:28 +0300)]
cmdutils: Pass the actual chosen encoder to filter_codec_opts

This allows passing the right options to encoders when there's more
than one encoder for a certain codec id.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoos_support: Add fallback definitions for stat flags
Ronald S. Bultje [Sun, 24 Jun 2012 18:21:07 +0000 (21:21 +0300)]
os_support: Add fallback definitions for stat flags

Mingw headers provide similar defines already (unconditional #defines,
without any #undef or #ifdef around it), while MSVC doesn't have
them.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoos_support: Rename the poll fallback function to ff_poll
Martin Storsjö [Mon, 25 Jun 2012 09:27:37 +0000 (12:27 +0300)]
os_support: Rename the poll fallback function to ff_poll

The fallback function is a non-static function, we shouldn't be
defining non-static functions outside of the proper ff/av prefix
namespaces.

This is especially important for a function like poll, which
other parties (other libraries, or executables linking these
libraries) also might provide similar but incompatible fallbacks for.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agonetwork: Check for struct pollfd
Martin Storsjö [Mon, 25 Jun 2012 09:08:44 +0000 (12:08 +0300)]
network: Check for struct pollfd

We need to include winsock2.h here, to make sure we have the
real pollfd struct definition, if one exists, before defining the
fallback poll function.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoos_support: Don't compare a negative number against socket descriptors
Martin Storsjö [Sun, 24 Jun 2012 19:36:37 +0000 (22:36 +0300)]
os_support: Don't compare a negative number against socket descriptors

The fds are unsigned integers in the windows definition of struct
sockfds. Due to this, the comparison if (fds[i].fd > n) was always
false.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoos_support: Include all the necessary headers for the win32 open function
Ronald S. Bultje [Sun, 24 Jun 2012 18:29:14 +0000 (21:29 +0300)]
os_support: Include all the necessary headers for the win32 open function

io.h is required for open and _wopen, and fcntl.h is required for
the O_CREAT flag. On mingw, fcntl.h is included by os_support.h (and
the mingw fcntl.h includes io.h), but include it explicitly here
since this implementation requires it.

Also move the #undef open up. open must not be defined to ff_win32_open
while including the headers that declare the open function. On mingw,
this happened in os_support.h before open was redirected.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: vc1: fix and enable optimised loop filter
Mans Rullgard [Fri, 22 Jun 2012 20:40:28 +0000 (21:40 +0100)]
x86: vc1: fix and enable optimised loop filter

The problem is that the ssse3 psign instruction does the wrong
thing here.  Commit ea60dfe incorrectly removed a macro emulating
this instruction for pre-ssse3 code.  However, the emulation is
incorrect, and the code relies on the behaviour of the macro.
Specifically, the psign sets destination elements to zero where
the corresponding source element is zero, whereas the emulation
only negates destination elements where the source is negative.

Furthermore, the PSIGNW_MMX macro in x86util.asm is totally bogus,
which is why the original VC-1 code had an additional right shift
when using it.  Since the psign instruction cannot be used here,
skip all the macro hell and use the working instruction sequence
directly.

None of this was noticed due a stray return statement in
ff_vc1dsp_init_mmx() which meant that only the mmx version of the
loop filter was ever used (before being removed in ea60dfe).

Signed-off-by: Mans Rullgard <mans@mansr.com>
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 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 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 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 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 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 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>
6 years agonetwork: Include unistd.h from network.h
Martin Storsjö [Sun, 24 Jun 2012 21:39:57 +0000 (00:39 +0300)]
network: Include unistd.h from network.h

This heaader is required for close() for sockets in network
code. For winsock, the equivalent function is defined in the
winsock2.h header.

This avoids having the HAVE_UNISTD_H in all files dealing with
raw sockets.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavconv: don't include vsrc_buffer.h, which doesn't exist anymore
Anton Khirnov [Tue, 26 Jun 2012 12:33:01 +0000 (14:33 +0200)]
avconv: don't include vsrc_buffer.h, which doesn't exist anymore

6 years agolavfi: reorder AVFilterLink fields.
Anton Khirnov [Thu, 21 Jun 2012 09:48:58 +0000 (11:48 +0200)]
lavfi: reorder AVFilterLink fields.

Move private fields to the private section, remove holes.

6 years agolavfi: reorder AVFilterContext fields.
Anton Khirnov [Thu, 21 Jun 2012 09:48:58 +0000 (11:48 +0200)]
lavfi: reorder AVFilterContext fields.

Place related fields together, remove holes.

6 years agolavfi: reorder AVFilter fields.
Anton Khirnov [Thu, 21 Jun 2012 09:48:58 +0000 (11:48 +0200)]
lavfi: reorder AVFilter fields.

Place related fields together, remove holes, move private fields to the
end and mark them as private.

6 years agolavfi: reorder AVFilterBufferRef fields.
Anton Khirnov [Thu, 21 Jun 2012 09:48:58 +0000 (11:48 +0200)]
lavfi: reorder AVFilterBufferRef fields.

Place related fields together, remove holes.

6 years agolavfi: reorder AVFilterBuffer fields.
Anton Khirnov [Thu, 21 Jun 2012 09:48:58 +0000 (11:48 +0200)]
lavfi: reorder AVFilterBuffer fields.

Place related fields together, remove holes.

6 years agolavfi: remove disabled FF_API_FILTERS_PUBLIC cruft
Anton Khirnov [Sun, 17 Jun 2012 10:36:52 +0000 (12:36 +0200)]
lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft

6 years agolavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft
Anton Khirnov [Sun, 17 Jun 2012 10:36:52 +0000 (12:36 +0200)]
lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft

6 years agolavfi: use proper FF_API guards for different deprecated functions
Anton Khirnov [Tue, 26 Jun 2012 11:17:31 +0000 (13:17 +0200)]
lavfi: use proper FF_API guards for different deprecated functions

6 years agolavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft
Anton Khirnov [Sun, 17 Jun 2012 10:36:52 +0000 (12:36 +0200)]
lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft

6 years agolavfi: remove disabled FF_API_SAMPLERATE64 cruft
Anton Khirnov [Sun, 17 Jun 2012 10:36:52 +0000 (12:36 +0200)]
lavfi: remove disabled FF_API_SAMPLERATE64 cruft

6 years agolavfi: remove disabled FF_API_GRAPH_AVCLASS cruft
Anton Khirnov [Sun, 17 Jun 2012 10:36:52 +0000 (12:36 +0200)]
lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft

6 years agolavfi: remove 'opaque' parameter from AVFilter.init()
Anton Khirnov [Thu, 21 Jun 2012 05:55:56 +0000 (07:55 +0200)]
lavfi: remove 'opaque' parameter from AVFilter.init()

It is not used in any filters currently and is inherently evil. If
passing binary data to filters is required in the future, it should be
done with some AVOptions-based system.

6 years agomov: do not try to read total disc/track number if data atom is too short.
Carl Eugen Hoyos [Thu, 17 Nov 2011 13:12:34 +0000 (14:12 +0100)]
mov: do not try to read total disc/track number if data atom is too short.

Fixes bug 308.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavconv: fix -force_key_frames
Anton Khirnov [Fri, 22 Jun 2012 12:36:27 +0000 (14:36 +0200)]
avconv: fix -force_key_frames

parse_forced_keyframes() relies in encoder timebase being set, so call
it from transcode_init() after it is known.

6 years agodxva2_h264: fix signaling of mbaff frames
Hendrik Leppkes [Mon, 27 Feb 2012 16:21:16 +0000 (17:21 +0100)]
dxva2_h264: fix signaling of mbaff frames

The MBAFF flag may only be signaled if we're actually dealing with
a full frame, and not singular fields, as it can happen in mixed content.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: fft: elf64: fix PIC build
Mans Rullgard [Mon, 25 Jun 2012 14:25:55 +0000 (15:25 +0100)]
x86: fft: elf64: fix PIC build

In a 64-bit PIC build, external functions must be called
through the PLT.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolog: Include io.h on windows
Ronald S. Bultje [Sun, 24 Jun 2012 17:57:35 +0000 (20:57 +0300)]
log: Include io.h on windows

This is required for isatty, which exists on MSVC and is found by
configure, but is provided by io.h instead of unistd.h.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavr: x86: merge some branches
Justin Ruggles [Mon, 25 Jun 2012 00:37:25 +0000 (20:37 -0400)]
lavr: x86: merge some branches

6 years agox86: cpu: whitespace (mostly) cosmetics
Mans Rullgard [Mon, 25 Jun 2012 12:43:32 +0000 (13:43 +0100)]
x86: cpu: whitespace (mostly) cosmetics

This adds whitespace around operators, aligns line continuation
backslashes, and breaks long lines.  Also fixes an ifdef halfway
through a statement.  The one line of duplication this saved is
not worth the ugliness.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: fft: win64: fix stack alignment for memcpy() call
Mans Rullgard [Mon, 25 Jun 2012 13:33:24 +0000 (14:33 +0100)]
x86: fft: win64: fix stack alignment for memcpy() call

6 years agowtv: Check the return value from gmtime
Martin Storsjö [Sat, 23 Jun 2012 18:46:26 +0000 (21:46 +0300)]
wtv: Check the return value from gmtime

On MSVC, gmtime returns NULL for values outside of their supported
range (and these show up in our fate test). This doesn't seem
to affect the actual fate test result.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: fft: convert sse inline asm to yasm
Mans Rullgard [Sat, 23 Jun 2012 18:08:11 +0000 (19:08 +0100)]
x86: fft: convert sse inline asm to yasm

6 years agox86: place some inline asm under #if HAVE_INLINE_ASM
Ronald S. Bultje [Fri, 22 Jun 2012 17:46:52 +0000 (18:46 +0100)]
x86: place some inline asm under #if HAVE_INLINE_ASM

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolog: Only include unistd.h if configure found it
Martin Storsjö [Sat, 23 Jun 2012 16:21:35 +0000 (19:21 +0300)]
log: Only include unistd.h if configure found it

MSVC has isatty (in io.h), but not unistd.h. (isatty isn't called
at all for windows, since there's a special case block for that.)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoape: create audio stream before reading tags.
Anton Khirnov [Fri, 22 Jun 2012 11:08:08 +0000 (13:08 +0200)]
ape: create audio stream before reading tags.

Tags may contain attached picture, which will be exported as video
streams.

This ensures that the audio stream is always the first.

6 years agomov: make a length variable larger.
Anton Khirnov [Thu, 21 Jun 2012 16:13:34 +0000 (18:13 +0200)]
mov: make a length variable larger.

Right now, it's uint16_t, but for itunes metadata a 32bit number is
stored in it.

6 years agoimage2: Add "start_number" private option to the demuxer
Mashiat Sarker Shakkhar [Sat, 23 Jun 2012 03:57:04 +0000 (09:57 +0600)]
image2: Add "start_number" private option to the demuxer

Currently if a pattern is given we look for up to the fifth file name in
the sequence. This option sets that limit to an arbitrary number.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoimage2: Add "start_number" private option to the muxer
Mashiat Sarker Shakkhar [Sat, 23 Jun 2012 03:53:43 +0000 (09:53 +0600)]
image2: Add "start_number" private option to the muxer

This adds the capability to start counting file number from an arbitrary
integer.

This includes a few lines of trivial code from FFmpeg codebase.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavconv: remove a forgotten debugging printf.
Anton Khirnov [Sat, 23 Jun 2012 14:10:08 +0000 (16:10 +0200)]
avconv: remove a forgotten debugging printf.

6 years agoavconv: use more descriptive names for hardcoded filters.
Anton Khirnov [Sat, 23 Jun 2012 14:08:24 +0000 (16:08 +0200)]
avconv: use more descriptive names for hardcoded filters.

Also ensure that all such filters get a non-NULL name. Should fix FATE
failures on some architectures after
58b049f2fa4f192b00baadb5f1f32ca366f936ea.

6 years agoavconv: remove redundant handling of async.
Anton Khirnov [Sat, 23 Jun 2012 14:02:45 +0000 (16:02 +0200)]
avconv: remove redundant handling of async.

Because of a mistake during merging the code for simple and complex
filtergraphs, -async inserts an asyncts filter both on input and output.
Remove the output hunk.

6 years agodoc/filters: fix typo.
Anton Khirnov [Fri, 22 Jun 2012 21:01:03 +0000 (23:01 +0200)]
doc/filters: fix typo.

6 years agoh264: use asm cabac reader under a generic condition
Mans Rullgard [Fri, 22 Jun 2012 17:52:27 +0000 (18:52 +0100)]
h264: use asm cabac reader under a generic condition

This removes a dependency on implementation details from generic
code and allows easy addition of the equivalent optimisation for
other architectures than x86.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: Only use optimizations with cmov if the CPU supports the instruction
Diego Biurrun [Tue, 19 Jun 2012 10:55:10 +0000 (12:55 +0200)]
x86: Only use optimizations with cmov if the CPU supports the instruction

6 years agox86: Add CPU flag for the i686 cmov instruction
Diego Biurrun [Tue, 19 Jun 2012 20:55:26 +0000 (22:55 +0200)]
x86: Add CPU flag for the i686 cmov instruction

6 years agox86: remove unused inline asm macros from dsputil_mmx.h
Mans Rullgard [Fri, 22 Jun 2012 21:11:02 +0000 (22:11 +0100)]
x86: remove unused inline asm macros from dsputil_mmx.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: move some inline asm macros to the only places they are used
Mans Rullgard [Fri, 22 Jun 2012 21:10:31 +0000 (22:10 +0100)]
x86: move some inline asm macros to the only places they are used

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolavfi: Add the af_channelmap audio channel mapping filter.
Alex Converse [Sat, 9 Jun 2012 01:42:53 +0000 (18:42 -0700)]
lavfi: Add the af_channelmap audio channel mapping filter.

Inspired by MPlayer's af_channels filter and SoX's remix effect.

6 years agolavfi: add join audio filter.
Anton Khirnov [Mon, 28 May 2012 05:28:58 +0000 (07:28 +0200)]
lavfi: add join audio filter.

It joins multiple input streams into one multi-channel output.