OSDN Git Service
Michael Niedermayer [Fri, 25 Mar 2011 11:00:17 +0000 (12:00 +0100)]
Revert "matroskadec: set default duration for simple block"
This reverts commit
98a7d560b4f835ba5b99b9974ee1a2c096198bea.
This has been implemented differently by aurel already
Michael Niedermayer [Fri, 25 Mar 2011 01:57:24 +0000 (02:57 +0100)]
Merge remote-tracking branch 'newdev/master'
* newdev/master:
matroskadec: set default duration for simple block
When building for MinGW32 disable strict ANSI compliancy.
ARM: fix ff_apply_window_int16_neon() prototype
configure: check for --as-needed support early
ARM: NEON optimised apply_window_int16()
ac3enc: NEON optimised shift functions
ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
mpeg12.c: fix slice threading for mpeg2 field picture mode.
ffmetadec.c: fix compiler warnings.
configure: Don't explicitly disable ffplay or in/outdevices on dos
configure: Remove the explicit disabling of ffserver
configure: Add fork as a dependency to ffserver
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 01:37:37 +0000 (02:37 +0100)]
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
Update todo.
Draw edges in MPV_frame_end when encoding
Conflicts:
libavcodec/mpegvideo.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 01:50:09 +0000 (02:50 +0100)]
Remove a tab, somehow it sneaked past the hooks in the merge war.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 01:26:49 +0000 (02:26 +0100)]
Make multiple Ctrl-C capable to kill stuck protocols.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 01:24:32 +0000 (02:24 +0100)]
Fix apparently exploitable race condition.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 00:13:08 +0000 (01:13 +0100)]
More advanced ffmpeg mpeg2 aspect guessing code.
Fixes issue1613, 621, 562 simultaneously
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Mar 2011 23:20:07 +0000 (00:20 +0100)]
log:Sanitize string of most control chars before printing.
This may be security relevant depending upon the used terminal.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
XV [Thu, 24 Mar 2011 21:32:21 +0000 (22:32 +0100)]
Intel H.263 aspect ratio processing fix.
XV [Thu, 24 Mar 2011 21:29:31 +0000 (22:29 +0100)]
Fix Intel I.263 "Strict H.263 compliance" file playback / issue2449
Aurelien Jacobs [Fri, 25 Mar 2011 00:02:53 +0000 (01:02 +0100)]
srtdec: make sure we don't write past the end of buffer
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
John Stebbins [Thu, 24 Mar 2011 23:34:18 +0000 (00:34 +0100)]
matroskadec: set default duration for simple block
When a normal Block is parsed, duration is initialized to
AV_NOPTS_VALUE. If it is not changed, then the track's default
duration is used. But for SimpleBlock, duration is initialized to
0 instead of AV_NOPTS_VALUE. This is due to the difference in how
EBML_NEST vs EBML_PASS are processed. Setting duration to 0 leads
eventually to wrongly estimate the frame duration in util.c
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diego Elio Pettenò [Thu, 24 Mar 2011 11:18:35 +0000 (12:18 +0100)]
When building for MinGW32 disable strict ANSI compliancy.
When -std=c99 is used, GCC defines __STRICT_ANSI__ to hide non-ANSI
interfaces; on MinGW32, when this macro is defined, some functions that are
part of POSIX but not of Windows APIs are disabled, including strcasecmp().
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Mans Rullgard [Thu, 24 Mar 2011 20:22:34 +0000 (20:22 +0000)]
ARM: fix ff_apply_window_int16_neon() prototype
The length argument should be unsigned. No change in code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 6 Mar 2011 13:57:34 +0000 (13:57 +0000)]
configure: check for --as-needed support early
This moves the check for --as-needed linker support before all
library tests, ensuring consistent behaviour between the checks
and the actual link step.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 23 Mar 2011 01:45:43 +0000 (01:45 +0000)]
ARM: NEON optimised apply_window_int16()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 12 Mar 2011 23:16:06 +0000 (23:16 +0000)]
ac3enc: NEON optimised shift functions
Mans Rullgard [Wed, 9 Mar 2011 19:51:50 +0000 (19:51 +0000)]
ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
Ronald S. Bultje [Thu, 24 Mar 2011 16:16:22 +0000 (12:16 -0400)]
mpeg12.c: fix slice threading for mpeg2 field picture mode.
Fixes "make THREADS=2 fate-mpeg2-field-enc".
Tomas Härdin [Mon, 21 Mar 2011 09:52:36 +0000 (10:52 +0100)]
Improve channel count and bitrate error handling in wmav* encode_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 24 Mar 2011 11:41:03 +0000 (07:41 -0400)]
ffmetadec.c: fix compiler warnings.
Martin Storsjö [Wed, 23 Mar 2011 12:49:37 +0000 (12:49 +0000)]
configure: Don't explicitly disable ffplay or in/outdevices on dos
The normal dependency tracking system disables them just fine.
Martin Storsjö [Wed, 23 Mar 2011 11:13:31 +0000 (13:13 +0200)]
configure: Remove the explicit disabling of ffserver
It is automatically disabled on both mingw and dos due to
the lack of fork.
Martin Storsjö [Wed, 23 Mar 2011 10:26:58 +0000 (12:26 +0200)]
configure: Add fork as a dependency to ffserver
Michael Niedermayer [Thu, 24 Mar 2011 01:12:17 +0000 (02:12 +0100)]
Merge remote-tracking branch 'newdev/master'
* newdev/master:
avio: make udp_set_remote_url/get_local_port internal.
asfdec: also subtract preroll when reading simple index object
matroskaenc: remove a variable that's unused after
bc17bd9.
avio: cosmetics - nicer vertical alignment.
Remove unnecessary icc version checks
Disable 'attribute "foo" ignored' warnings from icc
rtsp: Don't use a locale dependent format string
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
configure: get libavcodec version from new version.h header
lavc: move the version macros to a new installed header.
matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
Do not use format string "%0.3f" for RTSP Range field.
Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
Document usage of import libraries created by dlltool
configure: Set the correct lib target for arm/wince dlltool
fate: simplify regression-funcs.sh
fate: add support for multithread testing
Conflicts:
libavformat/rtspdec.c
libavutil/attributes.h
libavutil/internal.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Aurelien Jacobs [Thu, 24 Mar 2011 00:56:26 +0000 (01:56 +0100)]
matroskaenc: make sure we don't produce invalid file with no codec ID
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Aurelien Jacobs [Thu, 24 Mar 2011 00:54:15 +0000 (01:54 +0100)]
matroskaenc: add missing new line in av_log() call
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Aurelien Jacobs [Wed, 23 Mar 2011 23:28:19 +0000 (00:28 +0100)]
matroskadec: check that pointers were initialized before accessing them
fix ticket #14
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Compn [Wed, 23 Mar 2011 17:53:24 +0000 (13:53 -0400)]
fix typo
Anton Khirnov [Tue, 8 Mar 2011 09:35:52 +0000 (10:35 +0100)]
avio: make udp_set_remote_url/get_local_port internal.
Vladimir Pantelic [Thu, 17 Mar 2011 21:34:52 +0000 (22:34 +0100)]
asfdec: also subtract preroll when reading simple index object
This was missed when ASF was changed to return timestamps
without preroll.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Wed, 23 Mar 2011 10:09:34 +0000 (11:09 +0100)]
matroskaenc: remove a variable that's unused after
bc17bd9.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Wed, 23 Mar 2011 11:58:02 +0000 (11:58 +0000)]
avio: cosmetics - nicer vertical alignment.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 23 Mar 2011 11:30:44 +0000 (11:30 +0000)]
Remove unnecessary icc version checks
With unknown attribute warnings disabled, these checks are no
longer needed. Removing them improves readability while having
no effect on generated code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 23 Mar 2011 11:24:10 +0000 (11:24 +0000)]
Disable 'attribute "foo" ignored' warnings from icc
ICC lies about the version of gcc it emulates, which results
in unsupported attributes sometimes being used. The warning
is an annoyance and should be disabled.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Martin Storsjö [Wed, 23 Mar 2011 08:26:22 +0000 (10:26 +0200)]
rtsp: Don't use a locale dependent format string
In this particular case, we aren't ever printing anything else than
0.000 anyway.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Tomas Härdin [Mon, 21 Mar 2011 11:06:56 +0000 (12:06 +0100)]
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Mans Rullgard [Wed, 23 Mar 2011 09:39:00 +0000 (09:39 +0000)]
configure: get libavcodec version from new version.h header
This fixes shared library versioning after
3dd851c.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Mon, 14 Mar 2011 20:58:13 +0000 (21:58 +0100)]
lavc: move the version macros to a new installed header.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Wed, 23 Mar 2011 01:42:56 +0000 (02:42 +0100)]
Merge remote-tracking branch 'newdev/master'
* newdev/master: (33 commits)
Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
Add kbdwin.o to AC3 decoder
Detect byte-swapped AC-3 and support decoding it directly.
cosmetics: indentation
Always copy input data for AC3 decoder.
ac3enc: make sym_quant() branch-free
cosmetics: indentation
Add a CPU flag for the Atom processor.
id3v2: skip broken tags with invalid size
id3v2: don't explicitly skip padding
Make sure kbhit() is in conio.h
fate: update wmv8-drm reference
vc1: make P-frame deblock filter bit-exact.
configure: Add the -D parameter to the dlltool command
amr: Set the AVFMT_GENERIC_INDEX flag
amr: Set the pkt->pos field properly to the start of the packet
amr: Set the codec->bit_rate field based on the last packet
rtsp: Specify unicast for TCP interleaved streams, too
Set the correct target for mingw64 dlltool
applehttp: Change the variable for stream position in seconds into int64_t
...
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/ac3dec.c
libavformat/avio.h
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 21 Mar 2011 08:05:36 +0000 (09:05 +0100)]
matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
This also fixes broken SBR detection, which produced files with double
sample rate since
8ae0fa2.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Carl Eugen Hoyos [Tue, 22 Mar 2011 21:38:44 +0000 (22:38 +0100)]
Do not use format string "%0.3f" for RTSP Range field.
The format string was locale-depending.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Justin Ruggles [Sun, 20 Mar 2011 17:31:36 +0000 (13:31 -0400)]
Add apply_window_int16() to DSPContext with x86-optimized versions and use it
in the ac3_fixed encoder.
Martin Storsjö [Tue, 22 Mar 2011 13:07:16 +0000 (15:07 +0200)]
Document usage of import libraries created by dlltool
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Tue, 22 Mar 2011 13:07:15 +0000 (15:07 +0200)]
configure: Set the correct lib target for arm/wince dlltool
The correct machine name for dlltool is arm-wince.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 21 Mar 2011 23:13:48 +0000 (00:13 +0100)]
fate: simplify regression-funcs.sh
Factor ffmpeg calls using run_ffmpeg()
Luca Barbato [Mon, 21 Mar 2011 23:07:54 +0000 (00:07 +0100)]
fate: add support for multithread testing
Add a THREADS variable to fate calls.
Vitor Sessak [Sun, 20 Mar 2011 17:30:29 +0000 (18:30 +0100)]
Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Kieran Kunhya [Tue, 22 Mar 2011 22:17:41 +0000 (22:17 +0000)]
Add kbdwin.o to AC3 decoder
Fixes --disable-everything --enable-decoder=ac3
Signed-off-by: Mans Rullgard <mans@mansr.com>
Carl Eugen Hoyos [Tue, 22 Mar 2011 21:38:44 +0000 (22:38 +0100)]
Do not use format string "%0.3f" for RTSP Range field.
Fixes ticket 10.
The format string was locale-depending.
Michael Niedermayer [Tue, 22 Mar 2011 21:36:57 +0000 (22:36 +0100)]
Fake-Merge remote-tracking branch 'ffmpeg-mt/master'
Reimar Döffinger [Tue, 22 Mar 2011 18:22:07 +0000 (14:22 -0400)]
Detect byte-swapped AC-3 and support decoding it directly.
This allows the AC-3 decoder to be used directly with RealMedia
decoders that unlike the libavformat one do not byte-swap automatically.
Since the new code is only used in case we would fail directly otherwise
there should be no risk for regressions.
Justin Ruggles [Tue, 22 Mar 2011 18:14:41 +0000 (14:14 -0400)]
cosmetics: indentation
Justin Ruggles [Tue, 22 Mar 2011 18:11:34 +0000 (14:11 -0400)]
Always copy input data for AC3 decoder.
Depending on error_recognition is not correct, low values do
certainly not mean it is ok to crash.
Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Justin Ruggles [Tue, 22 Mar 2011 18:36:18 +0000 (14:36 -0400)]
ac3enc: make sym_quant() branch-free
Justin Ruggles [Tue, 22 Mar 2011 03:33:00 +0000 (23:33 -0400)]
cosmetics: indentation
Justin Ruggles [Tue, 22 Mar 2011 03:32:40 +0000 (23:32 -0400)]
Add a CPU flag for the Atom processor.
The Atom has SSSE3 support, which is useful in many cases, but sometimes the
SSSE3 version is slower than the SSE2 equivalent on the Atom, but is generally
faster on other processors supporting SSSE3. This flag allows for selectively
disabling certain SSSE3 functions on the Atom.
Anton Khirnov [Tue, 22 Mar 2011 09:35:35 +0000 (10:35 +0100)]
id3v2: skip broken tags with invalid size
fixes issue2649.
Anton Khirnov [Tue, 22 Mar 2011 09:35:34 +0000 (10:35 +0100)]
id3v2: don't explicitly skip padding
It's pointless, since there's a seek to the end of tag later.
Dave Yeo [Tue, 22 Mar 2011 03:47:48 +0000 (03:47 +0000)]
Make sure kbhit() is in conio.h
Conio.h is a non-standard header and may not have kbhit()
prototyped. This fixes compile on OS/2 where the EMX version (we're
using a fork) of conio.h only has getch() and getche().
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 22 Mar 2011 02:49:37 +0000 (02:49 +0000)]
fate: update wmv8-drm reference
This updates the wmv8-drm reference after
c47d383.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Ronald S. Bultje [Tue, 22 Mar 2011 01:26:26 +0000 (21:26 -0400)]
vc1: make P-frame deblock filter bit-exact.
Martin Storsjö [Mon, 21 Mar 2011 20:41:38 +0000 (22:41 +0200)]
configure: Add the -D parameter to the dlltool command
This is required for the generated .lib file to actually
be usable by MSVC.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Wed, 9 Feb 2011 10:19:39 +0000 (12:19 +0200)]
amr: Set the AVFMT_GENERIC_INDEX flag
This makes the amr demuxer support seeking, closing roundup
issue 2593.
Martin Storsjö [Wed, 9 Feb 2011 10:16:51 +0000 (12:16 +0200)]
amr: Set the pkt->pos field properly to the start of the packet
Previously, the field pointed to the second byte of the packet
(which is the first byte of the actual AMR payload).
Martin Storsjö [Wed, 9 Feb 2011 10:13:32 +0000 (12:13 +0200)]
amr: Set the codec->bit_rate field based on the last packet
This allows libavformat to guess an estimated duration for
amr files.
For streams with varying bit rates (or with silence descriptors
or "no frame" blocks) the guess is, of course, inaccurate.
Martin Storsjö [Mon, 21 Mar 2011 12:19:09 +0000 (14:19 +0200)]
rtsp: Specify unicast for TCP interleaved streams, too
According to the RFC, the default is multicast if nothing is
specified, which doesn't make sense for TCP.
According to a bug report, some Axis camera models give a
"400 Bad Request" error if this is omitted.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 21 Mar 2011 19:22:51 +0000 (20:22 +0100)]
Set the correct target for mingw64 dlltool
That fixes .lib creation for the win64 target.
Martin Storsjö [Mon, 21 Mar 2011 10:20:18 +0000 (12:20 +0200)]
applehttp: Change the variable for stream position in seconds into int64_t
A similar variable for the total stream duration was changed to
int64_t in
b79c3df08807c96a945, due to overflows in some odd
streams.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Mon, 21 Mar 2011 13:52:54 +0000 (15:52 +0200)]
ffplay: Don't assume ic->pb is non-null
This fixes crashes on exit when plaing some RealRTSP streams
(among other), e.g.
rtsp://dl.lib.brown.edu:554/areserves/
1093545294660883.mp3.
These crashes have been present since
3e68b3ba7b015cf21.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Tue, 15 Mar 2011 06:54:22 +0000 (07:54 +0100)]
id3v2: simplify error handling.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Thu, 17 Mar 2011 06:10:23 +0000 (07:10 +0100)]
id3v2: explicitly seek to the end of the tag after reading
Current code might stop in the middle of an invalid tag.
fixes issue2650
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Mon, 14 Mar 2011 19:38:59 +0000 (20:38 +0100)]
avio: make av_url_read_fseek/fpause internal.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Stefano Sabatini [Sun, 13 Mar 2011 20:22:59 +0000 (21:22 +0100)]
ffprobe: tweak error message in open_input_file()
Replace "codec (id=%d)" with "codec with id %d", slightly more
readable.
Ronald S. Bultje [Mon, 21 Mar 2011 14:00:43 +0000 (10:00 -0400)]
vc1: slice support.
Also reset coded_block at each new slice, fixes problems in slice playback.
Ronald S. Bultje [Tue, 1 Mar 2011 16:37:55 +0000 (11:37 -0500)]
vc1: fix up memleaks in the error codepath.
Introduce end: and err: labels at the end of vc1_decode_frame(), which
will clean up allocated memory consistently.
Ronald S. Bultje [Tue, 1 Mar 2011 16:37:55 +0000 (11:37 -0500)]
vc1: warn for unimplemented pan-scan feature.
Peter Ross [Sun, 20 Mar 2011 02:19:51 +0000 (13:19 +1100)]
Remove unused pixel format (PIX_FMT_UNUSED) and swap PIX_FMT_BGR48LE and PIX_FMT_BGR48BE enum order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Mon, 21 Mar 2011 11:06:56 +0000 (12:06 +0100)]
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
Carl Eugen Hoyos [Mon, 21 Mar 2011 11:04:10 +0000 (12:04 +0100)]
Allow demuxing of APE files with metadata tags.
Fixes ticket 11.
Michael Niedermayer [Mon, 21 Mar 2011 02:09:46 +0000 (03:09 +0100)]
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 17 Mar 2011 13:03:31 +0000 (14:03 +0100)]
avio: deprecate url_fileno
It's an evil hack that assumes an AVIOContext is always based on top of
an URLContext.
It's also not used anywhere.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Thu, 17 Mar 2011 06:41:19 +0000 (07:41 +0100)]
rmenc: replace avio_seek(0) with avio_tell()
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Thu, 17 Mar 2011 06:35:18 +0000 (07:35 +0100)]
lavf: replace some more avio_seek(SEEK_CUR) with avio_skip
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Mans Rullgard [Sun, 20 Mar 2011 22:04:47 +0000 (22:04 +0000)]
ffv1: allocate correct size for sample buffer
This fixes a typo in the size calculation for the sample buffer
introduced in
cbabccc367424.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Panagiotis H.M. Issaris [Thu, 10 Mar 2011 15:07:52 +0000 (16:07 +0100)]
Do no modify terminal parameters using termios.h
Remove usage of tcgetattr and tcsetattr to modify terminal
parameters, and rely on ctrl-c to stop instead of pressing 'q'.
On systems with conio.h, keep the old behavior.
Changing the terminal settings causes problems if multiple instances
are running asynchronously on the same terminal, such as during a
parallel FATE run, or if the process crashes before restoring the
terminal. In both cases, the terminal state is messed up requiring
a manual reset.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 20 Mar 2011 19:49:10 +0000 (19:49 +0000)]
Move ff_dct_init_mmx declaration to dct.h
This was missed in
0aded94.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mike Scheutzow [Sun, 20 Mar 2011 07:01:41 +0000 (08:01 +0100)]
doc: add details to the documentation for ffmpeg -map
Patch by Mike Sheutzow with some additions and changes by Stefano.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stefano Sabatini [Sun, 20 Mar 2011 07:01:40 +0000 (08:01 +0100)]
ffmpeg: modify help text for the map option
Change "file:stream[:syncfile:syncstream]" to
"file.stream[:syncfile.syncstream]", the latter syntax is more
consistent with the stream identifier form printed by
av_dump_format(), and more readable. Both syntaxes are currently
accepted by the opt_map() code.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Mans Rullgard [Sun, 20 Mar 2011 02:14:52 +0000 (02:14 +0000)]
dct: remove superflous #include
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 20 Mar 2011 02:14:25 +0000 (02:14 +0000)]
Move dct and rdft definitions to separate files
This leaves fft.h with only the core FFT and MDCT definitions
thus making it more managable.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 19 Mar 2011 23:44:00 +0000 (23:44 +0000)]
Move sine windows to a separate file
These windows do not really belong in fft/mdct files and were
easily confused with the similarly named tables used by rdft.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 19 Mar 2011 17:19:04 +0000 (17:19 +0000)]
Move ff_kbd_window_init() to a separate file
This function is not tightly coupled to mdct, and it's in the way
of making a fixed-point mdct implementation.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 19 Mar 2011 15:14:17 +0000 (15:14 +0000)]
fft: remove inline wrappers for function pointers
This removes the rather pointless wrappers (one not even inline)
for calling the fft_calc and related function pointers.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 6 Mar 2011 13:50:21 +0000 (13:50 +0000)]
configure: use pkg-config helpers
This makes existing pkg-config uses as well as the libsdl checks
use the new pkg-config helper functions, which should be more
robust against broken systems.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 6 Mar 2011 13:48:30 +0000 (13:48 +0000)]
configure: improve pkg-config support
This adds helper functions for checking packages with pkg-config
and managing the associated flags.
Note that pkg-config use is still discouraged due to widespread
poor practices resulting in broken flags in many situations. A
few badly designed packages require flags only obtainable using
pkg-config, and these functions are intended for those cases.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
3f8040db3e13c3dbdf07c74d92ca34817a69f733)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Mon, 7 Mar 2011 02:49:55 +0000 (02:49 +0000)]
configure: allow checking multiple functions in check_func_headers()
This makes it possible to pass a space-separated list of functions
to check_func_headers and check_lib2. If any function is missing,
none are enabled as available, so this should only be used for
all-or-nothing sets, i.e. groups in which none will be used if any
one is missing.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
edaf1ae2763ce1a23dec70e730ba2bb8ee476dfd)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Mar 2011 19:02:42 +0000 (20:02 +0100)]
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Not Pulled:
commit
42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
Author: Mans Rullgard <mans@mansr.com>
Date: Mon Feb 28 18:06:58 2011 +0000
Remove Sonic experimental audio codec
commit
2912e87a6c9264d556734e2bf94a99c64cf9b102
Author: Mans Rullgard <mans@mansr.com>
Date: Fri Mar 18 17:35:10 2011 +0000
Replace FFmpeg with Libav in licence headers
Peter Ross [Sat, 19 Mar 2011 04:24:09 +0000 (15:24 +1100)]
Add unused pixel format (PIX_FMT_UNUSED) to make PIX_FMT_BGR48BE an odd-valued enumeration
This is required for the isBE() macro internal to libswscale.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 19 Mar 2011 14:42:37 +0000 (15:42 +0100)]
ffplay: add braces around union definition
Fix warning:
ffplay.c: At top level:
ffplay.c:3027: warning: missing braces around initializer
ffplay.c:3027: warning: (near initialization for ‘options[53].u’)