ffmpeg.git
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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

7 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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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

7 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

7 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]

7 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]

7 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.

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

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

7 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>
7 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>
7 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.

7 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>
7 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>
7 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>
7 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>
7 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>
7 years agoRevert "Revert "x86: fft: win64: fix stack alignment for memcpy() call""
Nicolas George [Tue, 26 Jun 2012 13:56:01 +0000 (15:56 +0200)]
Revert "Revert "x86: fft: win64: fix stack alignment for memcpy() call""

This reverts commit f767658414fc85dea4006cb82969b6a925fdd380.

The bug it introduces has been fixed.

7 years agoRevert "Revert "x86: fft: convert sse inline asm to yasm""
Nicolas George [Tue, 26 Jun 2012 13:55:41 +0000 (15:55 +0200)]
Revert "Revert "x86: fft: convert sse inline asm to yasm""

This reverts commit fd91a3ec44de38251b2c15e03e26d14e983c4e44.

The bug it introduced has been fixed.

7 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

7 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.

7 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.

7 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.

7 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.

7 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.

7 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

7 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

7 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

7 years agosink_buffer: make opaque argument optional.
Nicolas George [Sun, 24 Jun 2012 21:28:29 +0000 (23:28 +0200)]
sink_buffer: make opaque argument optional.

7 years agobuffersink: group libav API functions.
Nicolas George [Sun, 24 Jun 2012 21:39:43 +0000 (23:39 +0200)]
buffersink: group libav API functions.

7 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

7 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

7 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

7 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.

7 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>
7 years agolavu/imgutils: create misc functions for dealing with buffers
Stefano Sabatini [Tue, 19 Jun 2012 00:45:36 +0000 (02:45 +0200)]
lavu/imgutils: create misc functions for dealing with buffers

Move the lavc/imgconvert functions and rename them as follows:
avpicture_get_size -> av_image_get_buffer_size()
avpicture_fill     -> av_image_fill_arrays()
avpicture_layout   -> av_image_copy_to_buffer()

The new functions have an align parameter, which allows to define the
linesize alignment assumed in the buffer (which is set or read).

The names of the functions are consistent with the lavu/samples API
(av_samples_get_buffer_size(), av_samples_fill_arrays()).

7 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.

7 years agoRevert "x86: fft: convert sse inline asm to yasm"
Nicolas George [Tue, 26 Jun 2012 11:00:14 +0000 (13:00 +0200)]
Revert "x86: fft: convert sse inline asm to yasm"

This reverts commit 82992604706144910f4a2f875d48cfc66c1b70d7.

It breaks shared builds on x86_64.

7 years agoRevert "x86: fft: win64: fix stack alignment for memcpy() call"
Nicolas George [Tue, 26 Jun 2012 10:59:48 +0000 (12:59 +0200)]
Revert "x86: fft: win64: fix stack alignment for memcpy() call"

This reverts commit 8725da49a2090de05b4b2d05e33727f45cb9d970.

Necerrary to revert 82992604706144910f4a2f875d48cfc66c1b70d7.

7 years agoffplay: add configure_filtergraph() helper
Stefano Sabatini [Mon, 25 Jun 2012 19:29:56 +0000 (21:29 +0200)]
ffplay: add configure_filtergraph() helper

Will help factorization with the pending -af patch, and add some checks
missing in the original code.

7 years agolavfi: drop deprecated and disabled packing API
Stefano Sabatini [Mon, 25 Jun 2012 22:52:30 +0000 (00:52 +0200)]
lavfi: drop deprecated and disabled packing API

It was deprecated and removed after the recent 2->3 major bump.

7 years agolavfi: remove old video sink API
Stefano Sabatini [Mon, 25 Jun 2012 18:24:50 +0000 (20:24 +0200)]
lavfi: remove old video sink API

It was deprecated since a long time and removed after the 2->3 major
bump.

7 years agotools/graph2dot: make dot graph representation a bit more compact
Stefano Sabatini [Sun, 24 Jun 2012 20:53:53 +0000 (22:53 +0200)]
tools/graph2dot: make dot graph representation a bit more compact

7 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>
7 years agoMake LucasArts Smush SANM palette opaque.
Carl Eugen Hoyos [Tue, 26 Jun 2012 07:52:10 +0000 (09:52 +0200)]
Make LucasArts Smush SANM palette opaque.

Reviewed-by: Paul B Mahol
7 years agoSignal MSS1 palette change.
Carl Eugen Hoyos [Tue, 26 Jun 2012 07:30:27 +0000 (09:30 +0200)]
Signal MSS1 palette change.

Reviewed-by: Paul B Mahol
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 25 Jun 2012 23:13:07 +0000 (01:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Include io.h on windows
  lavr: x86: merge some branches
  x86: cpu: whitespace (mostly) cosmetics
  x86: fft: win64: fix stack alignment for memcpy() call

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/intmath.h: Fix mull operand constraints
yang [Mon, 25 Jun 2012 22:53:47 +0000 (00:53 +0200)]
x86/intmath.h: Fix mull operand constraints

Fixes Ticket1466

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomss1: check number of free colours
Paul B Mahol [Mon, 25 Jun 2012 22:45:08 +0000 (22:45 +0000)]
mss1: check number of free colours

Prevents out of array write.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosonic: fix FPE
Michael Niedermayer [Mon, 25 Jun 2012 22:38:05 +0000 (00:38 +0200)]
sonic: fix FPE

Fixes Ticket1397

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 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>
7 years agoh264_parser: use av_assert
Michael Niedermayer [Mon, 25 Jun 2012 19:12:22 +0000 (21:12 +0200)]
h264_parser: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_loopfilter: use av_assert
Michael Niedermayer [Mon, 25 Jun 2012 19:12:07 +0000 (21:12 +0200)]
h264_loopfilter: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/drawtext: use av_opt_free() to free private context
Stefano Sabatini [Mon, 25 Jun 2012 20:41:33 +0000 (22:41 +0200)]
lavfi/drawtext: use av_opt_free() to free private context

Simplify code.

7 years agolavfi/abuffer: increase logging level of the log showing initial parameters
Stefano Sabatini [Fri, 22 Jun 2012 09:39:27 +0000 (11:39 +0200)]
lavfi/abuffer: increase logging level of the log showing initial parameters

Also show them in a more parsable/consistent fashion.

7 years agolavfi/avfilter.h: reorganize headers disposition
Stefano Sabatini [Fri, 22 Jun 2012 11:04:22 +0000 (13:04 +0200)]
lavfi/avfilter.h: reorganize headers disposition

Group lavfi headers together, slightly improve readability.

7 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>
7 years agoMake MSS1 palette opaque.
Carl Eugen Hoyos [Mon, 25 Jun 2012 19:16:06 +0000 (21:16 +0200)]
Make MSS1 palette opaque.

7 years agolavr: x86: merge some branches
Justin Ruggles [Mon, 25 Jun 2012 00:37:25 +0000 (20:37 -0400)]
lavr: x86: merge some branches

7 years agodoc/general: fix output
Paul B Mahol [Mon, 25 Jun 2012 17:36:57 +0000 (17:36 +0000)]
doc/general: fix output

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 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>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 25 Jun 2012 14:55:31 +0000 (16:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Check the return value from gmtime
  x86: fft: convert sse inline asm to yasm
  x86: place some inline asm under #if HAVE_INLINE_ASM

Conflicts:
libavcodec/x86/fft_sse.c
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 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

7 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>
7 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

7 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>
7 years agoffplay: give more meaningful names to the buffersink instances
Stefano Sabatini [Fri, 22 Jun 2012 09:03:57 +0000 (11:03 +0200)]
ffplay: give more meaningful names to the buffersink instances

7 years agolavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API
Stefano Sabatini [Fri, 22 Jun 2012 09:56:55 +0000 (11:56 +0200)]
lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API

Deprecate functions:
avfilter_fill_frame_from_buffer_ref
avfilter_fill_frame_from_audio_buffer_ref
avfilter_fill_frame_from_video_buffer_ref

and schedule to drop them at the next API major bump.

The function avfilter_copy_buf_props() should be used instead.

7 years agolavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h
Stefano Sabatini [Fri, 22 Jun 2012 10:59:29 +0000 (12:59 +0200)]
lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h

libavfilter API was designed in order to be clarly distinguished from the
libavcodec API, including avcodec.h in avfilter.h is not going to help to
stick to this principle.

The inclusion of libavutil/audioconvert.h in many files was required
because avcodec.h includes audioconvert.h.

libavfilter/avcodec.h is where the lavc/lavfi interface should be
entirely placed.

7 years agolavfi: move some FF_API_ definitions from avfilter.h to version.h
Stefano Sabatini [Fri, 22 Jun 2012 10:46:51 +0000 (12:46 +0200)]
lavfi: move some FF_API_ definitions from avfilter.h to version.h

version.h seems the right place for FF_API_ definitions.

7 years agovocenc: use new header from codec tag 4
Michael Niedermayer [Mon, 25 Jun 2012 01:38:29 +0000 (03:38 +0200)]
vocenc: use new header from codec tag 4

this matches sox and should fix ticket1119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovocenc: change default codec to 16bit
Michael Niedermayer [Mon, 25 Jun 2012 01:34:40 +0000 (03:34 +0200)]
vocenc: change default codec to 16bit

Hardly anyone would want 8bit today, 16bit is a much more reasonable
default.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovocenc: fix sample rate rounding direction
Michael Niedermayer [Mon, 25 Jun 2012 01:14:27 +0000 (03:14 +0200)]
vocenc: fix sample rate rounding direction

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: Try to fix source path for fate-acodec-dca
Michael Niedermayer [Sun, 24 Jun 2012 23:58:18 +0000 (01:58 +0200)]
fate: Try to fix source path for fate-acodec-dca

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: speedup dnxhd tests and reduce their memory requirements
Michael Niedermayer [Sun, 24 Jun 2012 22:29:03 +0000 (00:29 +0200)]
fate: speedup dnxhd tests and reduce their memory requirements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxwdenc: support 8bpp grayscale
Paul B Mahol [Sun, 24 Jun 2012 11:42:14 +0000 (11:42 +0000)]
xwdenc: support 8bpp grayscale

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoxwddec: support 8bpp grayscale
Piotr Bandurski [Sun, 24 Jun 2012 11:34:02 +0000 (11:34 +0000)]
xwddec: support 8bpp grayscale

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Jun 2012 19:34:54 +0000 (21:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Only include unistd.h if configure found it
  ape: create audio stream before reading tags.
  mov: make a length variable larger.
  image2: Add "start_number" private option to the demuxer
  image2: Add "start_number" private option to the muxer
  avconv: remove a forgotten debugging printf.
  avconv: use more descriptive names for hardcoded filters.
  avconv: remove redundant handling of async.
  doc/filters: fix typo.
  h264: use asm cabac reader under a generic condition

Conflicts:
ffmpeg.c
libavformat/img2dec.c
libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomlp_parser: use av_assert
Michael Niedermayer [Sun, 24 Jun 2012 18:20:23 +0000 (20:20 +0200)]
mlp_parser: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorangecoder.h: use av_assert
Michael Niedermayer [Sun, 24 Jun 2012 18:18:00 +0000 (20:18 +0200)]
rangecoder.h: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: fix libavutil.pc generation
Michael Niedermayer [Sun, 24 Jun 2012 18:11:11 +0000 (20:11 +0200)]
configure: fix libavutil.pc generation

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