ffmpeg.git
9 years agoAdd Speex support to the Ogg muxer.
Justin Ruggles [Tue, 13 Oct 2009 01:46:19 +0000 (01:46 +0000)]
Add Speex support to the Ogg muxer.

Originally committed as revision 20220 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoDo not read data past the end of the SSND chunk in the AIFF demuxer.
Justin Ruggles [Tue, 13 Oct 2009 00:19:34 +0000 (00:19 +0000)]
Do not read data past the end of the SSND chunk in the AIFF demuxer.
Fixes Issue 1455.

Originally committed as revision 20219 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoSupport Midvid JPEG Video Codec (still flipped).
Carl Eugen Hoyos [Mon, 12 Oct 2009 22:00:14 +0000 (22:00 +0000)]
Support Midvid JPEG Video Codec (still flipped).

Originally committed as revision 20218 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoSupport Intel JPEG Library Video Codec (still flipped).
Carl Eugen Hoyos [Mon, 12 Oct 2009 21:35:26 +0000 (21:35 +0000)]
Support Intel JPEG Library Video Codec (still flipped).

Originally committed as revision 20217 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoCalculate correct packet durations when demuxing Ogg/Speex. This involves
Justin Ruggles [Mon, 12 Oct 2009 21:30:03 +0000 (21:30 +0000)]
Calculate correct packet durations when demuxing Ogg/Speex. This involves
determining if there is any delay in the first packet and/or any truncation in
the final packet.

Originally committed as revision 20216 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoextend description of avcodec_decode_audio3:
Sascha Sommer [Mon, 12 Oct 2009 19:50:31 +0000 (19:50 +0000)]
extend description of avcodec_decode_audio3:
- clarify when 0 is returned
- explain that decode_audio3 has to be called multiple times when there
  are multiple frames in a single packet

Originally committed as revision 20215 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoMerge declaration and initialization
Reimar Döffinger [Mon, 12 Oct 2009 16:38:08 +0000 (16:38 +0000)]
Merge declaration and initialization

Originally committed as revision 20214 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoSimplify: use FFMIN
Reimar Döffinger [Mon, 12 Oct 2009 16:36:48 +0000 (16:36 +0000)]
Simplify: use FFMIN

Originally committed as revision 20213 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoReindent after removing the outer for loops in the execute2 patch
Reimar Döffinger [Mon, 12 Oct 2009 14:46:53 +0000 (14:46 +0000)]
Reindent after removing the outer for loops in the execute2 patch

Originally committed as revision 20212 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoMove dnxhdenc to execute2 multithreading API.
Reimar Döffinger [Mon, 12 Oct 2009 14:43:57 +0000 (14:43 +0000)]
Move dnxhdenc to execute2 multithreading API.
This allows for some simplifications like removing some outer loops
and gives much better performance for thread_count > number of idle CPUs.

Originally committed as revision 20211 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAdd an execute2 function that is more flexible and allows to use parallel
Reimar Döffinger [Mon, 12 Oct 2009 11:35:35 +0000 (11:35 +0000)]
Add an execute2 function that is more flexible and allows to use parallel
processing with jobs > threads without wasting too much memory.
It also avoids needing a separate int array when the only additional data
the jobs needs is a single int running from 0 to count-1.

Originally committed as revision 20210 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoDetect Windows Media DRM protected files and display warning if no key
Daniel G. Taylor [Sun, 11 Oct 2009 23:09:33 +0000 (23:09 +0000)]
Detect Windows Media DRM protected files and display warning if no key
was provided.

Patch by Daniel G. Taylor, dan programmer-art org

Originally committed as revision 20209 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: align stack in NEON h264 mc functions
Måns Rullgård [Sun, 11 Oct 2009 16:16:08 +0000 (16:16 +0000)]
ARM: align stack in NEON h264 mc functions

A certain rotten fruit operating system doesn't provide the 8-byte stack
alignment required by the standard ARM ABI, so align it manually.

Originally committed as revision 20208 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: force PIC for shared libs only with ARMv6T2 and later
Måns Rullgård [Sun, 11 Oct 2009 14:32:18 +0000 (14:32 +0000)]
ARM: force PIC for shared libs only with ARMv6T2 and later

Originally committed as revision 20207 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAllow autodetection of E-AC3.
Carl Eugen Hoyos [Sun, 11 Oct 2009 11:56:53 +0000 (11:56 +0000)]
Allow autodetection of E-AC3.

Originally committed as revision 20206 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoDo the dnxhd_720p_rd test with -threads 4 in order to also test the threading code.
Reimar Döffinger [Sun, 11 Oct 2009 11:50:12 +0000 (11:50 +0000)]
Do the dnxhd_720p_rd test with -threads 4 in order to also test the threading code.

Originally committed as revision 20205 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: simplify movrel definition as CONFIG_PIC is now set for shared libs
Måns Rullgård [Sun, 11 Oct 2009 10:15:48 +0000 (10:15 +0000)]
ARM: simplify movrel definition as CONFIG_PIC is now set for shared libs

Originally committed as revision 20204 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: enable PIC for shared libs
Måns Rullgård [Sun, 11 Oct 2009 10:15:45 +0000 (10:15 +0000)]
ARM: enable PIC for shared libs

Recent versions of gcc generate movw/movt pairs, and the linkers fail
to handle the associated relocations properly.  Those responsible at
Codesourcery have refused to consider fixing this.  Blame them for
making shared libraries slower than they need to be.

Originally committed as revision 20203 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years ago100l in avpicture_layout: width of chroma planes depends on format depth, too.
Reimar Döffinger [Sun, 11 Oct 2009 07:05:26 +0000 (07:05 +0000)]
100l in avpicture_layout: width of chroma planes depends on format depth, too.
Fixes issue 1465

Originally committed as revision 20202 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoWarn when WVC1 cannot be decoded
Kostya Shishkov [Sun, 11 Oct 2009 05:36:59 +0000 (05:36 +0000)]
Warn when WVC1 cannot be decoded

Originally committed as revision 20201 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAllow demuxing of E-AC3 (stream type 0x84) in MPEG-TS.
Carl Eugen Hoyos [Sat, 10 Oct 2009 21:17:52 +0000 (21:17 +0000)]
Allow demuxing of E-AC3 (stream type 0x84) in MPEG-TS.

Originally committed as revision 20200 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoHack: set the coded frame PTS to the incoming PTS.
Reimar Döffinger [Sat, 10 Oct 2009 14:43:31 +0000 (14:43 +0000)]
Hack: set the coded frame PTS to the incoming PTS.
This is not correct, but libtheora does not seem to provide a way
to get the correct value, and this is necessary to make encoding
produce sensible time stamps when encoded content is variable
FPS or the time base is simply different from FPS.
Somewhat fixes issue 1197.

Originally committed as revision 20199 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoDocument the additon of the w and h fields to AVFilterPic.
Stefano Sabatini [Sat, 10 Oct 2009 10:40:36 +0000 (10:40 +0000)]
Document the additon of the w and h fields to AVFilterPic.

Originally committed as revision 20198 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoFix 100l incorrect bitmask check.
Reimar Döffinger [Sat, 10 Oct 2009 08:49:57 +0000 (08:49 +0000)]
Fix 100l incorrect bitmask check.

Originally committed as revision 20197 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoPrint error message when true interlaced VC-1 frames are encountered
Kostya Shishkov [Sat, 10 Oct 2009 07:35:31 +0000 (07:35 +0000)]
Print error message when true interlaced VC-1 frames are encountered
to inform user why decoder produces no output.

Originally committed as revision 20196 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoDo not allow 0 sample rate in TMV demuxer
Daniel Verkamp [Fri, 9 Oct 2009 18:29:19 +0000 (18:29 +0000)]
Do not allow 0 sample rate in TMV demuxer

Originally committed as revision 20195 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoStricter TMV probe
Daniel Verkamp [Fri, 9 Oct 2009 18:24:47 +0000 (18:24 +0000)]
Stricter TMV probe

Originally committed as revision 20194 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAAC: Fix regression introduced in r20067 where ADTS files would always be
Robert Swain [Fri, 9 Oct 2009 15:38:44 +0000 (15:38 +0000)]
AAC: Fix regression introduced in r20067 where ADTS files would always be
signalled as having a channel configuration of 1 in output_configure().
Previously this didn't matter but it does now.

Originally committed as revision 20193 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agodca and aac decoders use float_to_int16_interleave, so check for
David Conrad [Thu, 8 Oct 2009 14:40:14 +0000 (14:40 +0000)]
dca and aac decoders use float_to_int16_interleave, so check for
the C version of that rather than float_to_int16.
Fixes output on ARM/VFP

Originally committed as revision 20192 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: whitespace cosmetics
Måns Rullgård [Wed, 7 Oct 2009 21:35:24 +0000 (21:35 +0000)]
ARM: whitespace cosmetics

Originally committed as revision 20191 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: NEON avg_pixels8 and avg_h264_qpel8_mc00
Måns Rullgård [Wed, 7 Oct 2009 21:35:19 +0000 (21:35 +0000)]
ARM: NEON avg_pixels8 and avg_h264_qpel8_mc00

Originally committed as revision 20190 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAdd w and h fields to AVFilterPic.
Stefano Sabatini [Wed, 7 Oct 2009 18:50:00 +0000 (18:50 +0000)]
Add w and h fields to AVFilterPic.

See the thread:
"[FFmpeg-devel] [PATCH] Add w,h fields to AVFilterPic".

Originally committed as revision 20189 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAdd ALAC encoding and decoding regression tests.
Justin Ruggles [Tue, 6 Oct 2009 22:47:33 +0000 (22:47 +0000)]
Add ALAC encoding and decoding regression tests.

Originally committed as revision 20188 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoImplement trace messages logging in the filterchain processing.
Stefano Sabatini [Tue, 6 Oct 2009 22:07:32 +0000 (22:07 +0000)]
Implement trace messages logging in the filterchain processing.

It is only enabled when the DEBUG symbol is defined.

Originally committed as revision 20187 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: make function names all-lowercase
Måns Rullgård [Tue, 6 Oct 2009 21:55:41 +0000 (21:55 +0000)]
ARM: make function names all-lowercase

Originally committed as revision 20186 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: enable ARMv4 add_pixels_clamped
Måns Rullgård [Tue, 6 Oct 2009 21:55:37 +0000 (21:55 +0000)]
ARM: enable ARMv4 add_pixels_clamped

Somehow this function was never used.

Originally committed as revision 20185 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: ARMv6 optimised add_pixels_clamped()
Måns Rullgård [Tue, 6 Oct 2009 21:55:35 +0000 (21:55 +0000)]
ARM: ARMv6 optimised add_pixels_clamped()

Originally committed as revision 20184 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: whitespace cosmetics
Måns Rullgård [Tue, 6 Oct 2009 21:55:30 +0000 (21:55 +0000)]
ARM: whitespace cosmetics

Originally committed as revision 20183 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoReindent
Daniel Verkamp [Tue, 6 Oct 2009 17:51:28 +0000 (17:51 +0000)]
Reindent

Originally committed as revision 20182 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAdd RF64 support to wav demuxer.
Daniel Verkamp [Tue, 6 Oct 2009 17:50:10 +0000 (17:50 +0000)]
Add RF64 support to wav demuxer.

Originally committed as revision 20181 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAdd my GPG key fingerprint
Daniel Verkamp [Tue, 6 Oct 2009 17:42:58 +0000 (17:42 +0000)]
Add my GPG key fingerprint

Originally committed as revision 20180 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoMove HuffYUV left prediction to dsputil.
Nathan Caldwell [Tue, 6 Oct 2009 16:06:15 +0000 (16:06 +0000)]
Move HuffYUV left prediction to dsputil.

Patch by Nathan Caldwell, saintdev gmail

Originally committed as revision 20179 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoSince some junk may be or may be not present before actual VC-1 extradata,
Andrew Dennison [Tue, 6 Oct 2009 15:30:08 +0000 (15:30 +0000)]
Since some junk may be or may be not present before actual VC-1 extradata,
search for real extradata start instead of always skipping one byte.

Patch by Andrew Dennison gmailify(${name}d, lists)
Thread: [PATCH] Fix VC1 "Incomplete extradata" for mkv files generated by eac3to

Originally committed as revision 20178 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoRemove casts that are useless since the argument is void *.
Reimar Döffinger [Tue, 6 Oct 2009 06:33:18 +0000 (06:33 +0000)]
Remove casts that are useless since the argument is void *.

Originally committed as revision 20177 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAllow building api-example from outside of libavcodec and also
Jai Menon [Tue, 6 Oct 2009 06:18:57 +0000 (06:18 +0000)]
Allow building api-example from outside of libavcodec and also
make it more consistent with libavformat/output-example.

Originally committed as revision 20176 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoOnly read ID3v1 tag if ID3v2 isn't present or is empty.
Anton Khirnov [Mon, 5 Oct 2009 21:36:56 +0000 (21:36 +0000)]
Only read ID3v1 tag if ID3v2 isn't present or is empty.
This prevents the demuxer from exporting multiple semantically identical but
differently named tags.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 20175 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agocosmetics: reindent and line wrap after last commit
Justin Ruggles [Mon, 5 Oct 2009 21:33:50 +0000 (21:33 +0000)]
cosmetics: reindent and line wrap after last commit

Originally committed as revision 20174 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoalacenc: add a fixed LPC coefficient mode as compression level 1. old
Justin Ruggles [Mon, 5 Oct 2009 21:27:36 +0000 (21:27 +0000)]
alacenc: add a fixed LPC coefficient mode as compression level 1. old
compression level 1 is now compression level 2 and is still the default.

Originally committed as revision 20173 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoRevert:
Michael Niedermayer [Mon, 5 Oct 2009 20:18:16 +0000 (20:18 +0000)]
Revert:
r18826 | stefano | 2009-05-14 20:50:58 +0200 (Thu, 14 May 2009) | 2 lines
Make av_set_string3() print a message in case of unknown option.

This change led to multiple identical error messages to be printed if an option
was not found.

Originally committed as revision 20172 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoid3v2: Export all text information frames with correct names.
Anton Khirnov [Mon, 5 Oct 2009 20:10:07 +0000 (20:10 +0000)]
id3v2: Export all text information frames with correct names.
Patch by Anton Khirnov <wyskas at gmail dot com>

Originally committed as revision 20171 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoMP3 muxer: Write all metadata.
Anton Khirnov [Mon, 5 Oct 2009 16:06:00 +0000 (16:06 +0000)]
MP3 muxer: Write all metadata.
Patch by Anton Khirnov <wyskas at gmail dot com>

Originally committed as revision 20170 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoFix pcm_read_seek () when the position it calculates is greater than 2 GB.
Daniel Verkamp [Mon, 5 Oct 2009 09:19:42 +0000 (09:19 +0000)]
Fix pcm_read_seek () when the position it calculates is greater than 2 GB.

pcm_read_seek() puts the return value of url_fseek() in an int and then
compares < 0 to see if an error occurred; if the position is greater
than 2 GB, the 32-bit signed int result will be < 0.

Change the type of ret to int64_t to avoid the wraparound.

patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 20169 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAllow the combined TrueHD/AC3 tracks on Blu-Ray discs to be demuxed as two separate...
Ian Caulfield [Mon, 5 Oct 2009 08:38:39 +0000 (08:38 +0000)]
Allow the combined TrueHD/AC3 tracks on Blu-Ray discs to be demuxed as two separate streams.

Patch by Ian Caulfield, ian D caulfield A gmail

Originally committed as revision 20168 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: add ff_ prefix to lots of functions
Måns Rullgård [Sun, 4 Oct 2009 13:13:12 +0000 (13:13 +0000)]
ARM: add ff_ prefix to lots of functions

Originally committed as revision 20167 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: cosmetics
Måns Rullgård [Sun, 4 Oct 2009 13:13:08 +0000 (13:13 +0000)]
ARM: cosmetics

Originally committed as revision 20166 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: replace some #if with if()
Måns Rullgård [Sun, 4 Oct 2009 13:13:06 +0000 (13:13 +0000)]
ARM: replace some #if with if()

Originally committed as revision 20165 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: clean up file/function naming conventions
Måns Rullgård [Sun, 4 Oct 2009 13:13:02 +0000 (13:13 +0000)]
ARM: clean up file/function naming conventions

Originally committed as revision 20164 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: clean up dsputil initialisation
Måns Rullgård [Sun, 4 Oct 2009 13:12:55 +0000 (13:12 +0000)]
ARM: clean up dsputil initialisation

- Move v5 and v6 initialisation to separate files.
- Move NEON IDCT selection to ff_dsputil_init_neon()

Originally committed as revision 20163 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoSun Raster RGB support
Peter Ross [Sun, 4 Oct 2009 08:42:23 +0000 (08:42 +0000)]
Sun Raster RGB support

Originally committed as revision 20162 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoAdd FIXME about low_delay vs has_b_frames.
Carl Eugen Hoyos [Sat, 3 Oct 2009 19:40:52 +0000 (19:40 +0000)]
Add FIXME about low_delay vs has_b_frames.

Originally committed as revision 20161 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoH264 allows B frames without requiring a >=1 sized buffer.
Wallak [Sat, 3 Oct 2009 19:30:09 +0000 (19:30 +0000)]
H264 allows B frames without requiring a >=1 sized buffer.

Patch by wallak, wallak free fr

Originally committed as revision 20160 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: shorten some long macro names
Måns Rullgård [Sat, 3 Oct 2009 18:22:56 +0000 (18:22 +0000)]
ARM: shorten some long macro names

Originally committed as revision 20159 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: update ldm/stm instructions to modern syntax
Måns Rullgård [Sat, 3 Oct 2009 18:22:52 +0000 (18:22 +0000)]
ARM: update ldm/stm instructions to modern syntax

Originally committed as revision 20158 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: whitespace cosmetics
Måns Rullgård [Sat, 3 Oct 2009 18:22:49 +0000 (18:22 +0000)]
ARM: whitespace cosmetics

Originally committed as revision 20157 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoReindent after channel layout commit from yesterday
Robert Swain [Sat, 3 Oct 2009 14:59:40 +0000 (14:59 +0000)]
Reindent after channel layout commit from yesterday

Originally committed as revision 20156 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoincrease maximum compressed frame size
Sascha Sommer [Sat, 3 Oct 2009 10:01:23 +0000 (10:01 +0000)]
increase maximum compressed frame size
fixes playback of piece.wmv

Originally committed as revision 20155 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoreturn AVERROR_INVALIDDATA when the bitstream could not be decoded
Sascha Sommer [Sat, 3 Oct 2009 09:44:05 +0000 (09:44 +0000)]
return AVERROR_INVALIDDATA when the bitstream could not be decoded

Originally committed as revision 20154 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoSupport decoding of uncompressed PCX scanlines
Peter Ross [Sat, 3 Oct 2009 05:18:32 +0000 (05:18 +0000)]
Support decoding of uncompressed PCX scanlines

Originally committed as revision 20153 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: use plain labels for pc-relative addressing
Måns Rullgård [Fri, 2 Oct 2009 23:11:03 +0000 (23:11 +0000)]
ARM: use plain labels for pc-relative addressing

Originally committed as revision 20152 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: remove unnecessary .fpu neon directives
Måns Rullgård [Fri, 2 Oct 2009 19:35:12 +0000 (19:35 +0000)]
ARM: remove unnecessary .fpu neon directives

Originally committed as revision 20151 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: use undocumented .syntax directive to enable UAL syntax
Måns Rullgård [Fri, 2 Oct 2009 19:35:07 +0000 (19:35 +0000)]
ARM: use undocumented .syntax directive to enable UAL syntax

Originally committed as revision 20150 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoPrefer "loglevel" over "logging level number or string" as argname of
Stefano Sabatini [Fri, 2 Oct 2009 19:06:27 +0000 (19:06 +0000)]
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

9 years agoAdd vorbis channel layout support according to those defined in the Vorbis I
Robert Swain [Fri, 2 Oct 2009 12:59:37 +0000 (12:59 +0000)]
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

9 years agoARM: apply extern symbol prefix where needed
Måns Rullgård [Fri, 2 Oct 2009 08:42:00 +0000 (08:42 +0000)]
ARM: apply extern symbol prefix where needed

Originally committed as revision 20147 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoconfigure: define extern symbol prefix without quotes for for asm files
Måns Rullgård [Fri, 2 Oct 2009 08:41:57 +0000 (08:41 +0000)]
configure: define extern symbol prefix without quotes for for asm files

Originally committed as revision 20146 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoDo not use -mdynamic-no-pic if PIC is enabled
Måns Rullgård [Fri, 2 Oct 2009 08:41:54 +0000 (08:41 +0000)]
Do not use -mdynamic-no-pic if PIC is enabled

Originally committed as revision 20145 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoARM: add -marm flag since we do not support Thumb
Måns Rullgård [Fri, 2 Oct 2009 08:41:52 +0000 (08:41 +0000)]
ARM: add -marm flag since we do not support Thumb

Originally committed as revision 20144 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agowav demuxer: return AVERROR_EOF instead of AVERROR(EIO) when the end of
Reimar Döffinger [Fri, 2 Oct 2009 07:27:08 +0000 (07:27 +0000)]
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

9 years agowav: return av_get_packet errors unchanged.
Reimar Döffinger [Fri, 2 Oct 2009 07:22:44 +0000 (07:22 +0000)]
wav: return av_get_packet errors unchanged.

Originally committed as revision 20142 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoFix seek regression test: several AVERROR(EIO) correctly changed to AVERROR_EOF.
Reimar Döffinger [Fri, 2 Oct 2009 07:19:21 +0000 (07:19 +0000)]
Fix seek regression test: several AVERROR(EIO) correctly changed to AVERROR_EOF.

Originally committed as revision 20141 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoRemove url_feof check that would be triggered only after incorrectly producing
Reimar Döffinger [Fri, 2 Oct 2009 07:05:52 +0000 (07:05 +0000)]
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

9 years agoRemove useless setting of pkt->size, av_get_packet already handles that.
Reimar Döffinger [Fri, 2 Oct 2009 07:03:04 +0000 (07:03 +0000)]
Remove useless setting of pkt->size, av_get_packet already handles that.

Originally committed as revision 20139 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoReturn special EOF checking for aiff and au demuxers, the check was at
Reimar Döffinger [Fri, 2 Oct 2009 06:42:20 +0000 (06:42 +0000)]
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

9 years agoReturn any error return values from av_get_packet, get_buffer etc. unchanged
Reimar Döffinger [Fri, 2 Oct 2009 06:40:50 +0000 (06:40 +0000)]
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

9 years agoMake seek regression tests fit after previous get_buffer change.
Reimar Döffinger [Fri, 2 Oct 2009 06:38:56 +0000 (06:38 +0000)]
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

9 years agoMake get_buffer and get_partial_buffer return url_ferror or AVERROR_EOF as
Reimar Döffinger [Fri, 2 Oct 2009 06:36:39 +0000 (06:36 +0000)]
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

9 years agoCheck whether 32-bit x86 is really 64-bit
David Conrad [Thu, 1 Oct 2009 21:38:25 +0000 (21:38 +0000)]
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

9 years agomatroskadec: cosmetics: indentation
Aurelien Jacobs [Thu, 1 Oct 2009 21:15:36 +0000 (21:15 +0000)]
matroskadec: cosmetics: indentation

Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agomatroskadec: don't overwrite extradata already read by ff_get_wav_header()
Aurelien Jacobs [Thu, 1 Oct 2009 21:14:46 +0000 (21:14 +0000)]
matroskadec: don't overwrite extradata already read by ff_get_wav_header()

Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agomatroskadec: fix handling of A_MS/ACM track with no extradata
Aurelien Jacobs [Thu, 1 Oct 2009 21:14:05 +0000 (21:14 +0000)]
matroskadec: fix handling of A_MS/ACM track with no extradata

Originally committed as revision 20131 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoMake rawvideo_read_packet return partial frames.
Reimar Döffinger [Thu, 1 Oct 2009 17:32:22 +0000 (17:32 +0000)]
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

9 years agoSimplify: remove pointless {} and else
Reimar Döffinger [Thu, 1 Oct 2009 17:26:20 +0000 (17:26 +0000)]
Simplify: remove pointless {} and else

Originally committed as revision 20129 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoRemove pointless setting of pkt->size, av_get_packet already handles this.
Reimar Döffinger [Thu, 1 Oct 2009 17:22:01 +0000 (17:22 +0000)]
Remove pointless setting of pkt->size, av_get_packet already handles this.

Originally committed as revision 20128 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoau demuxer: pass av_get_packet error on unchanged instead of converting to
Reimar Döffinger [Thu, 1 Oct 2009 17:08:33 +0000 (17:08 +0000)]
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

9 years agoav_new_packet failing should return ENOMEM, not EIO.
Reimar Döffinger [Thu, 1 Oct 2009 16:10:09 +0000 (16:10 +0000)]
av_new_packet failing should return ENOMEM, not EIO.

Originally committed as revision 20126 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoMake avcodec_open set codec_id and codec_type if they haven't been set.
Reimar Döffinger [Thu, 1 Oct 2009 15:54:55 +0000 (15:54 +0000)]
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

9 years agoput_bits can only reliably write up to 31 bit bits, above it relies on
Reimar Döffinger [Thu, 1 Oct 2009 15:40:29 +0000 (15:40 +0000)]
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

9 years agoUse MANGLE in cavsdsp, the current version using "m" constraints will not
Reimar Döffinger [Thu, 1 Oct 2009 15:30:27 +0000 (15:30 +0000)]
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

9 years agoDocument -sn option.
Diego Biurrun [Thu, 1 Oct 2009 13:48:23 +0000 (13:48 +0000)]
Document -sn option.

Originally committed as revision 20122 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 years agoFix indentation after last commit.
Benoit Fouet [Thu, 1 Oct 2009 12:21:54 +0000 (12:21 +0000)]
Fix indentation after last commit.

Originally committed as revision 20121 to svn://svn.ffmpeg.org/ffmpeg/trunk