1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

42110 Commits

Author SHA1 Message Date
Clément Bœsch
3491c2a909 swr: use __asm__ instead of __asm.
For consistency only.
2012-06-30 11:18:05 +02:00
Mans Rullgard
f2fd167835 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>
2012-06-30 00:12:05 +01:00
Michael Niedermayer
8a85660d3b 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>
2012-06-29 23:24:58 +02:00
Stefano Sabatini
94a00ec8af ffplay: group together and vertically align correlated parameters in log function
Possibly improve readability.
2012-06-29 23:15:45 +02:00
Stefano Sabatini
8179660222 ffplay: vertially align complex if condition in audio_decode_frame()
Possibly improve readability.
2012-06-29 23:15:45 +02:00
Stefano Sabatini
347ecfdc63 ffplay: move assignment in else block in audio_decode_frame()
Avoid confusing and pointless double assignment of variable
resampled_data_size.
2012-06-29 23:15:45 +02:00
Stefano Sabatini
0d3ffde64f ffplay: split overly long line in audio_decode_frame() 2012-06-29 23:15:45 +02:00
Michael Niedermayer
fb7688a83f 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>
2012-06-29 20:43:30 +02:00
Michael Niedermayer
7bbb6b38fb 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>
2012-06-29 20:43:30 +02:00
Michael Niedermayer
12863db840 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>
2012-06-29 20:43:30 +02:00
Clément Bœsch
439e32f9b8 RealText demuxer and decoder. 2012-06-29 20:22:04 +02:00
Clément Bœsch
53640f42be SAMI demuxer and decoder. 2012-06-29 20:21:28 +02:00
Clément Bœsch
d948893dbd lavf/subtitles: add some SMIL helpers.
This is needed for SAMI and RealText demuxers.
2012-06-29 20:20:02 +02:00
Clément Bœsch
e301f2f8c6 fate: add JacoSUB and MicroDVD subtitles tests. 2012-06-29 20:20:02 +02:00
Clément Bœsch
04568f8d1a fate: introduce subtitles.mak and move SubRip test in it. 2012-06-29 20:20:02 +02:00
Clément Bœsch
8f4ce626f8 lavc/microdvddec: support "DEFAULT" properties. 2012-06-29 20:20:02 +02:00
Clément Bœsch
0e7782c08e 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.
2012-06-29 20:20:02 +02:00
Clément Bœsch
a19e9f2d5c lavf/microdvd: rewrite using subtitles queue API. 2012-06-29 20:20:01 +02:00
Clément Bœsch
0ef28e119e lavf/jacosubdec: fix FPE in case timeres is badly set. 2012-06-29 20:19:59 +02:00
Clément Bœsch
60715511db lavf/jacosubdec: use subtitles queue API. 2012-06-29 19:13:25 +02:00
Clément Bœsch
7c9f9685ae lavf: add internal demuxer helpers for subtitles. 2012-06-29 19:13:24 +02:00
Clément Bœsch
f926d91611 ffmpeg: fix a memleak in subtitles decoding. 2012-06-29 19:13:24 +02:00
Stefano Sabatini
c1abfbc47c lavf/segment: rename segment private context from "c" to "seg" in segment_start()
Consistent with the rest of the file, less confusing.
2012-06-29 17:04:19 +02:00
Stefano Sabatini
a9a7e215e5 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().
2012-06-29 17:03:25 +02:00
Stefano Sabatini
3cd4f9fd76 lavf: allow multiple names in output devices selected by av_guess_format()
Consistent with av_find_input_format().
2012-06-29 16:54:18 +02:00
Martin Sliwka
df531b0e10 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>
2012-06-29 14:54:15 +02:00
Lou Logan
6851130fd6 cosmetics: minor libavcodec spelling errors
Also update some common misspelled words in patcheck

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 14:54:15 +02:00
Ronald S. Bultje
3b1ab197be 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>
2012-06-29 15:53:41 +03:00
Ronald S. Bultje
f985113075 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>
2012-06-29 15:52:07 +03:00
Stefano Sabatini
0692d4c890 lavf/segment: add some debugging logs 2012-06-29 14:50:27 +02:00
Stefano Sabatini
567eb9d344 lavf/segment: fix command with missing -list option
Replace -list with the correct option -segment_list.
2012-06-29 14:50:27 +02:00
Stefano Sabatini
d9355a03f2 lavf/applehttp: add log message in case of applehttp_read_header() failure
Improve error reporting.
2012-06-29 14:50:27 +02:00
Samuel Pitoiset
e312fcde6a doc: Indicate that RTMPT is natively implemented in libavformat
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-06-29 15:38:28 +03:00
Ronald S. Bultje
dfb57fc596 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>
2012-06-29 15:38:10 +03:00
Michael Niedermayer
e8e733adcc dca: favor native over ffmpeg in table name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 13:31:44 +02:00
Stefano Sabatini
4fd07b9366 ffplay: avoid useless NULL checks in swr_free()
swr_free() already checks for nullness, no need to add the check in
calling code.
2012-06-29 13:24:57 +02:00
Stefano Sabatini
4674718203 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.
2012-06-29 13:24:43 +02:00
Michael Niedermayer
491846e4be avutil: fix project name reference in doxy section
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 11:33:38 +02:00
Michael Niedermayer
84d73e9d5d dca: fix project reference in table name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 11:31:37 +02:00
Michael Niedermayer
be4ffb28b3 vf_ass: fix table name to refer to correct lib.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 11:28:34 +02:00
Michael Niedermayer
c83ed18d45 formats.h: fix project reference in comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 11:26:18 +02:00
Michael Niedermayer
c496224374 pixdesc: fix project reference in comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 11:23:56 +02:00
Paul B Mahol
8fbe11e623 Replace Libav with FFmpeg in license headers for files created by me
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-29 01:58:34 +00:00
Michael Niedermayer
c103dc0b48 git-howto: replace confusing and incorrect text about he testsuite by mostly a correct text.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 01:17:07 +02:00
Michael Niedermayer
4e82bdea60 git-howto: partial rewrite of the push checklist to make it match sanity & reality.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 01:06:12 +02:00
Michael Niedermayer
8bff1d7cb0 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>
2012-06-29 00:33:49 +02:00
Michael Niedermayer
7c8b5d1d80 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>
2012-06-29 00:05:40 +02:00
Michael Niedermayer
d007f963c2 git-howto: cleanup, remove unreasonable recommendition.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-29 00:03:12 +02:00
Michael Niedermayer
4453f6b861 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>
2012-06-28 23:57:31 +02:00
Stefano Sabatini
7877b50d18 ffplay: simplify code by using avfilter_unref_bufferp() 2012-06-28 22:27:05 +02:00