11 years agoUse av_match_ext() rather than the deprecated match_ext(), fix
Stefano Sabatini [Sun, 17 Jan 2010 15:57:51 +0000 (15:57 +0000)]
Use av_match_ext() rather than the deprecated match_ext(), fix

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

11 years agoFactorize error message logging in rgb2rgbWrapper().
Stefano Sabatini [Sun, 17 Jan 2010 15:11:25 +0000 (15:11 +0000)]
Factorize error message logging in rgb2rgbWrapper().

Originally committed as revision 30356 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoReindent
Måns Rullgård [Sun, 17 Jan 2010 14:25:19 +0000 (14:25 +0000)]

Originally committed as revision 30350 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoRemove inline from initFilter()
Måns Rullgård [Sun, 17 Jan 2010 14:25:17 +0000 (14:25 +0000)]
Remove inline from initFilter()

It makes no sense having that function inlined.

Originally committed as revision 30349 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoMake sure we do not export incorrect _NE pixformat descriptions by either
Reimar Döffinger [Sun, 17 Jan 2010 14:17:03 +0000 (14:17 +0000)]
Make sure we do not export incorrect _NE pixformat descriptions by either
including config.h if available or not defining them if it isn't.

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

11 years agoFix comment typo carefull -> careful
Måns Rullgård [Sun, 17 Jan 2010 13:39:34 +0000 (13:39 +0000)]
Fix comment typo carefull -> careful

Spotted by someone on IRC.

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

11 years agoAdd missing parens in AV_WN macros
Måns Rullgård [Sun, 17 Jan 2010 12:47:06 +0000 (12:47 +0000)]
Add missing parens in AV_WN macros

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

11 years agoAdd missing Makefile dependencies to CONFIG_SNOW_ENCODER.
Alexander Strange [Sun, 17 Jan 2010 08:24:45 +0000 (08:24 +0000)]
Add missing Makefile dependencies to CONFIG_SNOW_ENCODER.

Fixes build with --disable-encoders --enable-encoder=snow.
This fixes MPlayer build with --disable-mencoder.

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

11 years agoFix indentation after r21257.
Carl Eugen Hoyos [Sun, 17 Jan 2010 00:27:22 +0000 (00:27 +0000)]
Fix indentation after r21257.

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

11 years agoAdd a const qualifier in a cast, fix the gcc warning:
Stefano Sabatini [Sun, 17 Jan 2010 00:26:29 +0000 (00:26 +0000)]
Add a const qualifier in a cast, fix the gcc warning:
swscale.c: In function ‘sws_scale’:
swscale.c:2968: warning: cast discards qualifiers from pointer target type

Originally committed as revision 30341 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoSupport demuxing of Sony OpenMG files without metadata header.
Michael Karcher [Sun, 17 Jan 2010 00:23:08 +0000 (00:23 +0000)]
Support demuxing of Sony OpenMG files without metadata header.

Original patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de

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

11 years agoAdd a const qualifier in a cast, fix the gcc warning:
Stefano Sabatini [Sun, 17 Jan 2010 00:21:50 +0000 (00:21 +0000)]
Add a const qualifier in a cast, fix the gcc warning:
swscale.c: In function ‘planarCopy’:
swscale.c:2256: warning: cast discards qualifiers from pointer target type

Originally committed as revision 30340 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoFix typo, "get rid off" -> "get rid of".
Stefano Sabatini [Sat, 16 Jan 2010 22:49:00 +0000 (22:49 +0000)]
Fix typo, "get rid off" -> "get rid of".

Originally committed as revision 30338 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoregtest: run tests only for enabled codecs and formats
Måns Rullgård [Sat, 16 Jan 2010 20:18:24 +0000 (20:18 +0000)]
regtest: run tests only for enabled codecs and formats

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

11 years agoregtest: split wma test into wmav1 and wmav2
Måns Rullgård [Sat, 16 Jan 2010 20:18:22 +0000 (20:18 +0000)]
regtest: split wma test into wmav1 and wmav2

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

11 years agoregtest: split reference files allowing tests to run individually
Måns Rullgård [Sat, 16 Jan 2010 20:18:13 +0000 (20:18 +0000)]
regtest: split reference files allowing tests to run individually

With this change, the output is checked immediately after each test
has run.  This means commands like "make regtest-mpeg2" can now be
used to run a single test and get meaningful results.

By default, make will abort if any test fails.  To run all tests
regardless, use make -k.

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

11 years agoregtest: suppress console output from tests
Måns Rullgård [Sat, 16 Jan 2010 20:17:55 +0000 (20:17 +0000)]
regtest: suppress console output from tests

This disables all console output from the *-regression.sh scripts by
default.  If the V environment variable is set to 1, ffmpeg commands
are printed before being run.  If V is greater than 1, ffmpeg output
goes to the console, otherwise stderr is redirected to a file.

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

11 years agoRevert r30331, which broke compilation.
Stefano Sabatini [Sat, 16 Jan 2010 19:51:26 +0000 (19:51 +0000)]
Revert r30331, which broke compilation.

swScale_C is not templated if any optimization is to be used and

Originally committed as revision 30334 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoPrefer enum PixelFormat to int as the parameter type of
Stefano Sabatini [Sat, 16 Jan 2010 19:32:58 +0000 (19:32 +0000)]
Prefer enum PixelFormat to int as the parameter type of

Originally committed as revision 30333 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoDeclare with av_unused the variable alpMmxFilter, fix the gcc warning:
Stefano Sabatini [Sat, 16 Jan 2010 19:22:30 +0000 (19:22 +0000)]
Declare with av_unused the variable alpMmxFilter, fix the gcc warning:
swscale_template.c: In function ‘swScale_C’:
swscale_template.c:2580: warning: unused variable ‘alpMmxFilter’
swscale_template.c: In function ‘sws_init_swScale_C’:

Originally committed as revision 30332 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoFactorize the code which calls the non optimized C functions in
Stefano Sabatini [Sat, 16 Jan 2010 19:19:54 +0000 (19:19 +0000)]
Factorize the code which calls the non optimized C functions in

Originally committed as revision 30331 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoPrefer "to %s%s" over "to%s %s", slightly more readable.
Stefano Sabatini [Sat, 16 Jan 2010 19:14:29 +0000 (19:14 +0000)]
Prefer "to %s%s" over "to%s %s", slightly more readable.

Originally committed as revision 30330 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoSimplify code in sws_getContext() which logs if the destination format
Stefano Sabatini [Sat, 16 Jan 2010 19:11:03 +0000 (19:11 +0000)]
Simplify code in sws_getContext() which logs if the destination format
support dithering, remove the const char *dither variable and use a
literal string instead.

Originally committed as revision 30329 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoDocument some of SwsContext.
Ramiro Polla [Sat, 16 Jan 2010 19:04:55 +0000 (19:04 +0000)]
Document some of SwsContext.

Originally committed as revision 30328 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoReuse h{lum,chr}Filter{,Pos} variables for MMX2 fast_bilinear horizontal scaler.
Ramiro Polla [Sat, 16 Jan 2010 18:39:06 +0000 (18:39 +0000)]
Reuse h{lum,chr}Filter{,Pos} variables for MMX2 fast_bilinear horizontal scaler.

Originally committed as revision 30327 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoFactorize code which logs the source and destination formats in
Stefano Sabatini [Sat, 16 Jan 2010 18:36:21 +0000 (18:36 +0000)]
Factorize code which logs the source and destination formats in

Originally committed as revision 30326 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoRead "Last Changed Rev" field instead of "Revision" field to avoid being
Ramiro Polla [Sat, 16 Jan 2010 18:29:52 +0000 (18:29 +0000)]
Read "Last Changed Rev" field instead of "Revision" field to avoid being
affected by changes in other directories (such as branches).

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

11 years agoComment for() ; out
Michael Niedermayer [Sat, 16 Jan 2010 17:41:40 +0000 (17:41 +0000)]
Comment for() ; out
~200 bytes smaller ff_h264_filter_mb()
please everyone, NEVER add code with the assumtation that gcc will remove it
without checking gcc actually does. Chances are it does not.

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

11 years agoMark a few functions as noinline, this makes ff_h264_filter_mb() a bit smaller
Michael Niedermayer [Sat, 16 Jan 2010 17:27:17 +0000 (17:27 +0000)]
Mark a few functions as noinline, this makes ff_h264_filter_mb() a bit smaller
and 5% faster.
ff_h264_filter_mb_fast() stay the same size as gcc decided not to inline these
functions there in the first place.

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

11 years agoApply last 2 optimizations to similar code i forgot.
Michael Niedermayer [Sat, 16 Jan 2010 16:21:12 +0000 (16:21 +0000)]
Apply last 2 optimizations to similar code i forgot.

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

11 years agoAnother microopt, 4 cpu cycles for avoidance of FFABS().
Michael Niedermayer [Sat, 16 Jan 2010 16:14:32 +0000 (16:14 +0000)]
Another microopt, 4 cpu cycles for avoidance of FFABS().

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

11 years agoAdd missing guards and includes to arm/aac.h
Måns Rullgård [Sat, 16 Jan 2010 15:54:01 +0000 (15:54 +0000)]
Add missing guards and includes to arm/aac.h

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

11 years agoMinor (2 cpu cycles) optimization ||->|.
Michael Niedermayer [Sat, 16 Jan 2010 15:19:05 +0000 (15:19 +0000)]
Minor (2 cpu cycles) optimization ||->|.

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

11 years agoSupport decoding of SoftLab-NSK VideoTizer.
ami_stuff [Sat, 16 Jan 2010 13:13:49 +0000 (13:13 +0000)]
Support decoding of SoftLab-NSK VideoTizer.

Patch by ami_stuff, ami_stuff o2 pl

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

11 years agoConsider slice_beta_offet in qp_thresh.
Michael Niedermayer [Sat, 16 Jan 2010 13:12:11 +0000 (13:12 +0000)]
Consider slice_beta_offet in qp_thresh.

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

11 years agoAvoid wasting 4 cpu cycles per MB in redundantly calculating qp_thresh.
Michael Niedermayer [Sat, 16 Jan 2010 11:55:35 +0000 (11:55 +0000)]
Avoid wasting 4 cpu cycles per MB in redundantly calculating qp_thresh.

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

11 years agoSimplify reset_ptr(): employ usePal() macro rather than enumerating
Stefano Sabatini [Sat, 16 Jan 2010 11:08:16 +0000 (11:08 +0000)]
Simplify reset_ptr(): employ usePal() macro rather than enumerating
all the paletted formats.

Originally committed as revision 30317 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoImplement null video sink.
Stefano Sabatini [Sat, 16 Jan 2010 11:05:36 +0000 (11:05 +0000)]
Implement null video sink.

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

11 years agoCorrectly decode some Avid AV1x samples, fixes issue 1684.
Carl Eugen Hoyos [Sat, 16 Jan 2010 10:46:45 +0000 (10:46 +0000)]
Correctly decode some Avid AV1x samples, fixes issue 1684.

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

11 years agoImplement null video source.
Stefano Sabatini [Sat, 16 Jan 2010 10:43:53 +0000 (10:43 +0000)]
Implement null video source.

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

11 years agoSupport lowres 3 when decoding MPEG video.
Anatoly Nenashev [Sat, 16 Jan 2010 10:41:52 +0000 (10:41 +0000)]
Support lowres 3 when decoding MPEG video.

Patch by Anatoliy Nenashev, nenashev_as mail ru

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

11 years agoMake avfilter_default_start_frame() request a buffer with the same
Stefano Sabatini [Sat, 16 Jan 2010 10:10:14 +0000 (10:10 +0000)]
Make avfilter_default_start_frame() request a buffer with the same
size of the output link of the destination filter, rather than of the
size of the input link.
In particular this fixes a crash in the rotate filter.

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

11 years agoReplace cabac checks in inline functions from h264.h with constants.
Michael Niedermayer [Sat, 16 Jan 2010 05:41:33 +0000 (05:41 +0000)]
Replace cabac checks in inline functions from h264.h with constants.
No benchmark because its just replacing variables with litteral constants
(so no risk for slowdown outside gcc silliness) and i need sleep.

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

11 years agoAdd symbol versioning for shared libraries
Måns Rullgård [Sat, 16 Jan 2010 04:49:02 +0000 (04:49 +0000)]
Add symbol versioning for shared libraries

Based on patch by Reinhard Tartler <siretart tauware de>

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

11 years agoconfigure: add test_ldflags function
Måns Rullgård [Sat, 16 Jan 2010 04:48:58 +0000 (04:48 +0000)]
configure: add test_ldflags function

This adds a test_ldflags function for testing linker flags without
adding them to LDFLAGS like check_ldflags does.

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

11 years agoAdd symbol versioning for shared libraries
Måns Rullgård [Sat, 16 Jan 2010 04:48:55 +0000 (04:48 +0000)]
Add symbol versioning for shared libraries

Based on patch by Reinhard Tartler <siretart tauware de>

Originally committed as revision 30315 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoSIPR16k decoder
Vitor Sessak [Sat, 16 Jan 2010 03:54:55 +0000 (03:54 +0000)]
SIPR16k decoder

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

11 years agoAllow a SIPR table to be used by the upcoming SIPR16k decoder
Vitor Sessak [Sat, 16 Jan 2010 03:44:17 +0000 (03:44 +0000)]
Allow a SIPR table to be used by the upcoming SIPR16k decoder

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

11 years agoSplit some SIPR structs to a header file for the upcoming SIPR16k commit
Vitor Sessak [Sat, 16 Jan 2010 03:40:25 +0000 (03:40 +0000)]
Split some SIPR structs to a header file for the upcoming SIPR16k commit

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

11 years agoUse macros instead of inline functions to replace the following missing C99
Vitor Sessak [Sat, 16 Jan 2010 01:27:46 +0000 (01:27 +0000)]
Use macros instead of inline functions to replace the following missing C99
functions: exp2, exp2f, log2, log2f.

Should fix compilation in systems where these functions are defined in math.h
but not implemented.

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

11 years agoSupport 2Vuy in mov, fixes issue 1690.
ami_stuff [Sat, 16 Jan 2010 00:32:09 +0000 (00:32 +0000)]
Support 2Vuy in mov, fixes issue 1690.

Patch by ami_stuff, ami_stuff o2 pl

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

11 years agoExclude .svn and .git directories from doxygen documentation.
Ramiro Polla [Fri, 15 Jan 2010 21:49:10 +0000 (21:49 +0000)]
Exclude .svn and .git directories from doxygen documentation.

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

11 years agoFix out of tree build with hardcoded tables
Måns Rullgård [Fri, 15 Jan 2010 20:48:34 +0000 (20:48 +0000)]
Fix out of tree build with hardcoded tables

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

11 years agomingw32: Build for Windows XP by default. Add note about Win9x/2000 support.
Ramiro Polla [Fri, 15 Jan 2010 20:30:03 +0000 (20:30 +0000)]
mingw32: Build for Windows XP by default. Add note about Win9x/2000 support.

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

11 years agoDon't initialize normal horizontal filter if MMX2 filter is used.
Ramiro Polla [Fri, 15 Jan 2010 19:50:59 +0000 (19:50 +0000)]
Don't initialize normal horizontal filter if MMX2 filter is used.

Originally committed as revision 30313 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoGet one step closer to world domination.
Ramiro Polla [Fri, 15 Jan 2010 19:16:28 +0000 (19:16 +0000)]
Get one step closer to world domination.
Remove "make uninstall".

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

11 years agoDo not print VDPAU upgrade notice when configure is invoked
Jai Menon [Fri, 15 Jan 2010 18:50:53 +0000 (18:50 +0000)]
Do not print VDPAU upgrade notice when configure is invoked
with `--disable-vdpau`.

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

11 years agoAAC: optimise bitstream reading in decode_spectrum_and_dequant()
Måns Rullgård [Fri, 15 Jan 2010 14:02:52 +0000 (14:02 +0000)]
AAC: optimise bitstream reading in decode_spectrum_and_dequant()

Using the low-level macros directly avoids redundant open/update/close

2-3% faster on ARM, PPC, and Core i7.

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

11 years agoSupport decoding of Avid uncompressed mov files, fixes issue 1685.
Carl Eugen Hoyos [Fri, 15 Jan 2010 11:03:40 +0000 (11:03 +0000)]
Support decoding of Avid uncompressed mov files, fixes issue 1685.

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

11 years agoSupport decoding Avid 1:1x codec, (partially) fixes issue1684.
Carl Eugen Hoyos [Fri, 15 Jan 2010 10:55:31 +0000 (10:55 +0000)]
Support decoding Avid 1:1x codec, (partially) fixes issue1684.

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

11 years agoConst correctness for src pointer. Remove all constness related warnings in
Zuxy Meng [Fri, 15 Jan 2010 08:51:51 +0000 (08:51 +0000)]
Const correctness for src pointer. Remove all constness related warnings in

Originally committed as revision 30306 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoAdd forgotten include of h264_mvpred.h to h264.h.
Michael Niedermayer [Fri, 15 Jan 2010 03:42:56 +0000 (03:42 +0000)]
Add forgotten include of h264_mvpred.h to h264.h.
This could have caused the linking failure of pred_pskip_motion() missing if
a compiler included never used static functions.

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

11 years agoAdd forgotton multiple inclusion guards to h264_mvpred.h.
Michael Niedermayer [Fri, 15 Jan 2010 03:41:28 +0000 (03:41 +0000)]
Add forgotton multiple inclusion guards to h264_mvpred.h.

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

11 years agoAAC: ARM/NEON asm for VMUL2/4 functions
Måns Rullgård [Fri, 15 Jan 2010 02:58:24 +0000 (02:58 +0000)]
AAC: ARM/NEON asm for VMUL2/4 functions

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

11 years agoDo not assign codec_tag to pix_fmt in rawdec.c, but in raw.c
Carl Eugen Hoyos [Fri, 15 Jan 2010 00:45:47 +0000 (00:45 +0000)]
Do not assign codec_tag to pix_fmt in rawdec.c, but in raw.c

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

11 years agoFix typo.
Stefano Sabatini [Fri, 15 Jan 2010 00:39:25 +0000 (00:39 +0000)]
Fix typo.

Originally committed as revision 30304 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoOptimise av_log2 with clz when available
Måns Rullgård [Thu, 14 Jan 2010 19:58:12 +0000 (19:58 +0000)]
Optimise av_log2 with clz when available

10% faster flac decoding on x86 and ARM.

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

11 years agoSet HAVE_FAST_CLZ if CPU has a fast count leading zeros instruction
Måns Rullgård [Thu, 14 Jan 2010 19:58:09 +0000 (19:58 +0000)]
Set HAVE_FAST_CLZ if CPU has a fast count leading zeros instruction

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

11 years agoRemove unused clip_table code.
Ramiro Polla [Thu, 14 Jan 2010 19:12:42 +0000 (19:12 +0000)]
Remove unused clip_table code.

Originally committed as revision 30303 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoconfigure: allow reverse auto-selection of options
Måns Rullgård [Thu, 14 Jan 2010 18:25:38 +0000 (18:25 +0000)]
configure: allow reverse auto-selection of options

This adds the possibility to set foo_if and foo_if_any variables,
causing foo to be enabled if all/any of the listed options are

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

11 years agoChange code so it uses 2 adds instead of one FFABS.
Reimar Döffinger [Thu, 14 Jan 2010 17:50:33 +0000 (17:50 +0000)]
Change code so it uses 2 adds instead of one FFABS.
About 1% faster ff_ac3_bit_alloc_calc_psd on Intel Atom, overall speedup
not measurable though.
Should have a bigger effect on systems without cmov or with very slow cmov.

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

11 years agoLatent libavformat version bump and documentation update for Adobe Filmstrip muxer...
Peter Ross [Thu, 14 Jan 2010 14:02:06 +0000 (14:02 +0000)]
Latent libavformat version bump and documentation update for Adobe Filmstrip muxer and demuxer (r21212)

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

11 years agoAdobe Filmstrip muxer and demuxer
Peter Ross [Thu, 14 Jan 2010 12:55:44 +0000 (12:55 +0000)]
Adobe Filmstrip muxer and demuxer

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

11 years agoAdd const qualifier to rgb48 to YV12 functions' src.
Ramiro Polla [Thu, 14 Jan 2010 06:19:45 +0000 (06:19 +0000)]
Add const qualifier to rgb48 to YV12 functions' src.

Originally committed as revision 30301 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoAdd missing parameter to rgb48 to YV12 functions.
Ramiro Polla [Thu, 14 Jan 2010 06:19:10 +0000 (06:19 +0000)]
Add missing parameter to rgb48 to YV12 functions.

Originally committed as revision 30300 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoImplement alpha channel decoding for BGR HuffYUV.
Alexander Strange [Thu, 14 Jan 2010 01:32:49 +0000 (01:32 +0000)]
Implement alpha channel decoding for BGR HuffYUV.

Since BGR24 is decoded as BGR32, fill its alpha channel with 255
using the appropriate predictors.

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

11 years agoset stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at...
Andrew Wason [Thu, 14 Jan 2010 00:32:36 +0000 (00:32 +0000)]
set stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at rectalogic dot com
Fixes issue 671.

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

11 years agodo not skip mdat data if it's the last atom, avoids one seek
Baptiste Coudurier [Wed, 13 Jan 2010 23:33:29 +0000 (23:33 +0000)]
do not skip mdat data if it's the last atom, avoids one seek

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

11 years agorestore old buffer content when seek failed in http protocol, fix issue #1631
Baptiste Coudurier [Wed, 13 Jan 2010 23:27:52 +0000 (23:27 +0000)]
restore old buffer content when seek failed in http protocol, fix issue #1631

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

11 years agorevert wrongly commited hunk in r21205
Baptiste Coudurier [Wed, 13 Jan 2010 22:57:37 +0000 (22:57 +0000)]
revert wrongly commited hunk in r21205

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

11 years agoremove useless type declarations
Baptiste Coudurier [Wed, 13 Jan 2010 22:52:22 +0000 (22:52 +0000)]
remove useless type declarations

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

11 years agoremove useless declarations from mpegts.h
Baptiste Coudurier [Wed, 13 Jan 2010 22:50:26 +0000 (22:50 +0000)]
remove useless declarations from mpegts.h

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

11 years agouse codec rc_max_rate if set and warn if bit rate is not set
Baptiste Coudurier [Wed, 13 Jan 2010 22:23:29 +0000 (22:23 +0000)]
use codec rc_max_rate if set and warn if bit rate is not set

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

11 years agoDo not split audio frames accross pes packets.
Baptiste Coudurier [Wed, 13 Jan 2010 22:21:45 +0000 (22:21 +0000)]
Do not split audio frames accross pes packets.
This was not supported by some equipment and cisco analyzer.

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

11 years agoSurprisingly enough, the RTP muxer does not depend on the RTP protocol
Luca Abeni [Wed, 13 Jan 2010 22:06:59 +0000 (22:06 +0000)]
Surprisingly enough, the RTP muxer does not depend on the RTP protocol
nor on network support.

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

11 years agoprint more debug info about muxing parameters, patch by Mike Scheutzow, scheutzow...
Mike Scheutzow [Wed, 13 Jan 2010 21:42:55 +0000 (21:42 +0000)]
print more debug info about muxing parameters, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com

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

11 years agoupdate mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel...
Mike Scheutzow [Wed, 13 Jan 2010 21:40:37 +0000 (21:40 +0000)]
update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com

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

11 years agoInsert null packets to keep pcr values correct, patch by Mike Scheutzow,
Mike Scheutzow [Wed, 13 Jan 2010 20:44:56 +0000 (20:44 +0000)]
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
scheutzow at alcatel-lucent dot com and Niobos, niobos at dest-unreach dot be.

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

11 years agomove pcr/sdt/pat period computation after ts->mux_rate is set, patch by Mike Scheutzo...
Mike Scheutzow [Wed, 13 Jan 2010 20:30:55 +0000 (20:30 +0000)]
move pcr/sdt/pat period computation after ts->mux_rate is set, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com

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

11 years agooutput a pcr as soon as possible, patch by Mike Scheutzow, scheutzow at alcatel-lucen...
Mike Scheutzow [Wed, 13 Jan 2010 20:26:59 +0000 (20:26 +0000)]
output a pcr as soon as possible, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com

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

11 years agofix ts packet header size computation, patch by Niobos, niobos at dest-unreach dot be
Niobos [Wed, 13 Jan 2010 20:20:05 +0000 (20:20 +0000)]
fix ts packet header size computation, patch by Niobos, niobos at dest-unreach dot be

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

11 years agofix sdt, pat, pcr size computation, patch by Niobos, niobos at dest-unreach dot be
Niobos [Wed, 13 Jan 2010 20:14:53 +0000 (20:14 +0000)]
fix sdt, pat, pcr size computation, patch by Niobos, niobos at dest-unreach dot be

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

11 years agoThe RTP muxer does not need rtp_asf.c
Luca Abeni [Wed, 13 Jan 2010 18:27:21 +0000 (18:27 +0000)]
The RTP muxer does not need rtp_asf.c

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

11 years agoRemove the inclusion of unneeded headers
Luca Abeni [Wed, 13 Jan 2010 18:18:21 +0000 (18:18 +0000)]
Remove the inclusion of unneeded headers

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

11 years agoDefine !CONFIG_FOO in config.make if feature disabled
Måns Rullgård [Wed, 13 Jan 2010 17:48:13 +0000 (17:48 +0000)]
Define !CONFIG_FOO in config.make if feature disabled

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

11 years agoAAC: Reduce depth of vlc_spectral tables to 2
Måns Rullgård [Wed, 13 Jan 2010 16:46:39 +0000 (16:46 +0000)]
AAC: Reduce depth of vlc_spectral tables to 2

Up to 6% faster overall on i7, no change on A8.

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

11 years agoAAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
Måns Rullgård [Wed, 13 Jan 2010 16:46:35 +0000 (16:46 +0000)]
AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()

GCC should be able to do this, but doesn't.  Slightly faster code.

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

11 years agoAAC: simplify some calculations in decode_spectrum_and_dequant()
Måns Rullgård [Wed, 13 Jan 2010 16:46:32 +0000 (16:46 +0000)]
AAC: simplify some calculations in decode_spectrum_and_dequant()

Simplify cur_band_type, group_len, and coef/offset calculations.  This
makes the code easier to read and slightly faster.

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

11 years agoAAC: Compress codebook tables and optimise sign bit handling
Måns Rullgård [Wed, 13 Jan 2010 16:46:28 +0000 (16:46 +0000)]
AAC: Compress codebook tables and optimise sign bit handling

The codebooks each consist of small number of values repeated in
groups of 2 or 4.  Storing the codebooks as a packed list of 2- or
4-bit indexes into a table reduces their size substantially (from 7.5k
to 1.5k), resulting in less cache pressure.

For the band types with sign bits in the bitstream, storing the number
and position of non-zero codebook values using a few bits avoids
multiple get_bits() calls and floating-point comparisons which gcc
handles miserably.

Some float/int type punning also avoids gcc brain damage.

Overall speedup 20-35% on Cortex-A8, 20% on Core i7.

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

11 years agoFix issue1658 (trailing space in rtpmap descriptor).
Ronald S. Bultje [Wed, 13 Jan 2010 15:55:42 +0000 (15:55 +0000)]
Fix issue1658 (trailing space in rtpmap descriptor).

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