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

21199 Commits

Author SHA1 Message Date
Stefano Sabatini
43d160fd00 Prefer "loglevel" over "logging level number or string" as argname of
the loglevel command line option.

Make the loglevel option help message more clear, since the option
argument is shown as a single token, and make the whole message better
aligned with the other help messages.

Originally committed as revision 20149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 19:06:27 +00:00
Robert Swain
53a71e1ba4 Add vorbis channel layout support according to those defined in the Vorbis I
specification

Originally committed as revision 20148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 12:59:37 +00:00
Måns Rullgård
e654b7c29e ARM: apply extern symbol prefix where needed
Originally committed as revision 20147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 08:42:00 +00:00
Måns Rullgård
c7f7978ae3 configure: define extern symbol prefix without quotes for for asm files
Originally committed as revision 20146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 08:41:57 +00:00
Måns Rullgård
8dfa86f78a Do not use -mdynamic-no-pic if PIC is enabled
Originally committed as revision 20145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 08:41:54 +00:00
Måns Rullgård
50fa82e6d2 ARM: add -marm flag since we do not support Thumb
Originally committed as revision 20144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 08:41:52 +00:00
Reimar Döffinger
3fcb5113c6 wav demuxer: return AVERROR_EOF instead of AVERROR(EIO) when the end of
the file is reached normally, without any error.

Originally committed as revision 20143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:27:08 +00:00
Reimar Döffinger
e581b6288f wav: return av_get_packet errors unchanged.
Originally committed as revision 20142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:22:44 +00:00
Reimar Döffinger
4bd7cb8be2 Fix seek regression test: several AVERROR(EIO) correctly changed to AVERROR_EOF.
Originally committed as revision 20141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:19:21 +00:00
Reimar Döffinger
fbc6630168 Remove url_feof check that would be triggered only after incorrectly producing
an empty packet and also av_get_packet already handles EOF now.

Originally committed as revision 20140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:05:52 +00:00
Reimar Döffinger
8a62a378de Remove useless setting of pkt->size, av_get_packet already handles that.
Originally committed as revision 20139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:03:04 +00:00
Reimar Döffinger
a7a9dd0eb6 Return special EOF checking for aiff and au demuxers, the check was at
the wrong place, causing an empty packet to be read before EOF was
detected and the eof detection is already now handled by av_get_packet anyway.

Originally committed as revision 20138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 06:42:20 +00:00
Reimar Döffinger
c3db0bc61d Return any error return values from av_get_packet, get_buffer etc. unchanged
in the raw demuxers.
Also remove special handling of 0-size reads, if they are due to an error/eof,
these are already converted to the appropriate error by get_buffer.

Originally committed as revision 20137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 06:40:50 +00:00
Reimar Döffinger
593b50cedf Make seek regression tests fit after previous get_buffer change.
The au and aiff demuxers would always return an empty packet before
detecting EOF, this is now fixed with av_get_packet etc. returning EOF.

Originally committed as revision 20136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 06:38:56 +00:00
Reimar Döffinger
7f7686dfb1 Make get_buffer and get_partial_buffer return url_ferror or AVERROR_EOF as
appropriate if it couldn't read any data at all.
This should make handling of EOF and error simpler or make it work right without
extra code in a few place (e.g. raw demuxer).

Originally committed as revision 20135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 06:36:39 +00:00
David Conrad
de27f4d957 Check whether 32-bit x86 is really 64-bit
Fixes configure on OS X 10.6

Originally committed as revision 20134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 21:38:25 +00:00
Aurelien Jacobs
553e9f7529 matroskadec: cosmetics: indentation
Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 21:15:36 +00:00
Aurelien Jacobs
ff0d5a745e matroskadec: don't overwrite extradata already read by ff_get_wav_header()
Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 21:14:46 +00:00
Aurelien Jacobs
038146e9cf matroskadec: fix handling of A_MS/ACM track with no extradata
Originally committed as revision 20131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 21:14:05 +00:00
Reimar Döffinger
22a7e19b50 Make rawvideo_read_packet return partial frames.
This is consistent with other demuxers and also fixes a memleak (memory
allocated for partial frame data was leaked).

Originally committed as revision 20130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:32:22 +00:00
Reimar Döffinger
8cb724c5c4 Simplify: remove pointless {} and else
Originally committed as revision 20129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:26:20 +00:00
Reimar Döffinger
d4c1803e0e Remove pointless setting of pkt->size, av_get_packet already handles this.
Originally committed as revision 20128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:22:01 +00:00
Reimar Döffinger
b46c98bf66 au demuxer: pass av_get_packet error on unchanged instead of converting to
AVERROR(EIO).

Originally committed as revision 20127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:08:33 +00:00
Reimar Döffinger
c67031e7cf av_new_packet failing should return ENOMEM, not EIO.
Originally committed as revision 20126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 16:10:09 +00:00
Reimar Döffinger
681c180dc4 Make avcodec_open set codec_id and codec_type if they haven't been set.
This fixes the API breakage introduced by the check that avctx codec id and type
match the opened codec and should make (almost?) all applications work again.

Originally committed as revision 20125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 15:54:55 +00:00
Reimar Döffinger
43d7c6118d put_bits can only reliably write up to 31 bit bits, above it relies on
undefined shift behaviour.
Document this, fix the assert and add a put_bits32 to handle writing 32
bits and use that where necessary.

Originally committed as revision 20124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 15:40:29 +00:00
Reimar Döffinger
ec65675504 Use MANGLE in cavsdsp, the current version using "m" constraints will not
compile on e.g. OpenBSD due to running out of registers.

Originally committed as revision 20123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 15:30:27 +00:00
Diego Biurrun
f0ef7beeb6 Document -sn option.
Originally committed as revision 20122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 13:48:23 +00:00
Benoit Fouet
05ec0c0012 Fix indentation after last commit.
Originally committed as revision 20121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 12:21:54 +00:00
Anne-Laure de Smit
e23dd95dc2 Add support for TARGA images without RLE compression.
Patch by Anne-Laure de Smit: gmail_address(annelaure, desmit)

Originally committed as revision 20120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 12:20:08 +00:00
Diego Biurrun
07f77dad7a Explain the process of patch review and commit a bit.
Originally committed as revision 20119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 11:58:34 +00:00
Aurelien Jacobs
e471e3c4a5 Fix playback of strange AVI files with stray LIST.
sample: http://samples.mplayerhq.hu/avi/AV36_1.AVI
fix suggested by Michael

Originally committed as revision 20118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 10:24:02 +00:00
Diego Biurrun
2499f4e09e Fix wrongly indented block.
Originally committed as revision 20117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 09:30:08 +00:00
Diego Biurrun
081c14a318 Use "!exp" instead of "exp == NULL" in if condition.
Originally committed as revision 20116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 09:13:21 +00:00
Diego Biurrun
37a4269d70 cosmetics: K&R coding style, prettyprinting
Originally committed as revision 20115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 09:11:07 +00:00
Kostya Shishkov
a8b95021e5 Do not attempt to decode TIFF files containing fax data with uncompressed
mode allowed for there is no code to decode it (yet).

Originally committed as revision 20114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 06:31:49 +00:00
Kostya Shishkov
8355572f91 lavc MJPEG decoder is capable of decoding some extended sequential
Huffman-compressed JPEG files, so make it decode those files
(samples are welcome).
This fixes issue 1420

Originally committed as revision 20113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 05:52:38 +00:00
Kostya Shishkov
5073cca404 Make BMP decoder produce flipped picture with RLE compression.
This fixes issue 1415

Originally committed as revision 20112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 05:46:17 +00:00
Kostya Shishkov
b08de903cd Make MS RLE decoder produce both bottom-up and top-down pictures
Originally committed as revision 20111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 05:42:55 +00:00
Justin Ruggles
535497f193 Change an error to a warning to support broken AC-3 files known to exist.
Fixes Issue 1426.

Originally committed as revision 20110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 00:06:54 +00:00
David Conrad
6945c2bc4c Support constant-quant encoding for libtheora
Based on a patch by j f (gonzaz-z # operamail (d) com)

Originally committed as revision 20109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 22:25:49 +00:00
Måns Rullgård
7cee5421d6 configure: break a long line
Originally committed as revision 20108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 22:08:16 +00:00
Reimar Döffinger
e04a3c9613 Re-add check for compilation failure with ebx clobber, and only set
ebx_available if both "b" constraint and exb clobber code compile.
This is to fix compilation with Mac OSX 10.5.8's gcc 4.0.1 in 64
bit mode (-m64) which only fails for ebx/rbx clobbers but not
"b" constraints - this is probably a compiler bug.

Originally committed as revision 20107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 21:57:13 +00:00
Justin Ruggles
3fdccca091 10l: wrong operation in stereo rematrixing
Originally committed as revision 20106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 21:51:02 +00:00
Måns Rullgård
49214f61a5 configure: return result of test from check_asm
This makes it possible to use check_asm in conditionals.

Originally committed as revision 20105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 21:38:11 +00:00
Anne-Laure de Smit
2aa6e87a97 Add support for SGI images without RLE compression.
patch by Anne-Laure de Smit, annelaure.desmit gmail com

Originally committed as revision 20104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 21:23:47 +00:00
Reimar Döffinger
5200b90147 Do not needlessly add 7 to put_buts_count before dividing by 8,
flush_put_bits ensures it is divisible 8.

Originally committed as revision 20103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 20:47:59 +00:00
Reimar Döffinger
f2ad907060 10l in code reading codec_name, the first byte is the length and should not
become part of the string.

Originally committed as revision 20102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 18:27:39 +00:00
Reimar Döffinger
5baaf9adaf Use a "b" constraint instead of ebx clobber to detect if EBX is available.
The test using clobber incorrectly indicates ebx to be available with the
default compilers on OpenBSD 4.5 and Haiku.

Originally committed as revision 20101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 16:55:32 +00:00
Lasse Reinhold
391dbb54a6 Use floating point mathematics when encoding mpeg audio.
Fixes issue 975: high db peak levels when encoding mp2

Original patch by Lasse Reinhold, lassemikkelreinhold hotmail

Originally committed as revision 20100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 15:13:09 +00:00