1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

6413 Commits

Author SHA1 Message Date
Kostya Shishkov
811d914652 indentation
Originally committed as revision 12395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 14:16:27 +00:00
Kostya Shishkov
1ba3bae800 Correctly handle empty frames
Originally committed as revision 12394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 14:15:40 +00:00
Kostya Shishkov
8c908d7d61 Fraps v5 decoding support
Originally committed as revision 12393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 09:04:35 +00:00
Kostya Shishkov
6a02cb8239 Add step variable (for future v5 decoding)
Originally committed as revision 12392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 09:03:23 +00:00
Diego Biurrun
e73e4e75f9 cosmetics: Fix indentation in a few more places.
Originally committed as revision 12381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 20:27:16 +00:00
Diego Biurrun
ef3dfbd427 cosmetics: Normalize {} placement after for, while, if.
Originally committed as revision 12380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 20:24:24 +00:00
Aurelien Jacobs
a73cbf9709 huffman: add a zero_count flag and use it in fraps
fixes issue349

Originally committed as revision 12374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 18:08:16 +00:00
Aurelien Jacobs
bac02ed3c5 huffman: pass hnode_first as a flag instead of as an argument on its own
Originally committed as revision 12373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 17:57:13 +00:00
Mark Cox
8d06bd53f8 Fix unused variable warnings.
patch by mark cox, melbournemark+ffmpeg gmail.com

Originally committed as revision 12370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 17:18:28 +00:00
Diego Biurrun
9b25f4a65f cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.
Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 14:39:43 +00:00
Ramiro Polla
5dea940937 __stdcall -> WINAPI
Windows x64 has no __stdcall.
It is not yet supported, but someday it might...

Originally committed as revision 12363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:47:44 +00:00
Måns Rullgård
0e32c8c65a simplify library version handling
Originally committed as revision 12362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:27:17 +00:00
Baptiste Coudurier
cbaf50f850 indentation
Originally committed as revision 12356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 23:10:47 +00:00
Baptiste Coudurier
7ee4dd0282 do not display par and dar if not available
Originally committed as revision 12355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 23:09:16 +00:00
Måns Rullgård
5671fc14f6 consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 20:44:44 +00:00
Panagiotis Issaris
d42a814ef1 Make av_class a pointer to a const AVClass. Addresses one warning in
imgresample.c.

Originally committed as revision 12352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 17:41:31 +00:00
Benjamin Larsson
ebf71dbda5 Don't use unchecked data from the bitstream.
Originally committed as revision 12351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 14:22:02 +00:00
Baptiste Coudurier
30400f0d03 fix interlaced decoding, original patch from reimar
Originally committed as revision 12349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 09:45:59 +00:00
Kostya Shishkov
9dc92a38a0 IMA ADPCM encoder - QT variant
Originally committed as revision 12348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 07:30:41 +00:00
Aurelien Jacobs
9822564d1d make compilation of mpeg12* and mpegvideo conditional
Originally committed as revision 12345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 21:43:30 +00:00
Aurelien Jacobs
6cbe71bd06 move ff_mpeg1_dc_scale_table to mpegvideo.c
Originally committed as revision 12344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 21:29:15 +00:00
Aurelien Jacobs
5a4334618c add dependencies for matroska audio and nut muxers over lavc
Originally committed as revision 12339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 16:34:47 +00:00
Aurelien Jacobs
dc85e85943 doxyfy frame type comments and add some more comments
Originally committed as revision 12337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 15:23:54 +00:00
Aurelien Jacobs
48d533e6fa define BI frame type along with other frame types
Originally committed as revision 12336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 15:19:26 +00:00
Aurelien Jacobs
c06ccb1357 cosmetic: align
Originally committed as revision 12335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 15:15:07 +00:00
Aurelien Jacobs
591bf9b942 add some required objects dependencies
Originally committed as revision 12333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 14:49:43 +00:00
Aurelien Jacobs
0c291f2d0f Avoid linking with h263 and mpeg4 find_frame_end()
when those codecs are not enabled.

Originally committed as revision 12332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 14:46:51 +00:00
Mike Melanson
282ee4e766 fix the WC3 Xan decoder by correcting the frame accounting logic
Originally committed as revision 12326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 06:58:20 +00:00
Michael Niedermayer
378774e9a8 Fix handling flags with the MSB set.
Originally committed as revision 12324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 03:59:07 +00:00
Aurelien Jacobs
fbd4293df9 remove more useless mpegvideo.h includes
Originally committed as revision 12323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 00:43:11 +00:00
Aurelien Jacobs
cbcd6c8ca9 move EDGE_WIDTH definition allong with draw_edges where it belongs
Originally committed as revision 12322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 00:38:14 +00:00
Aurelien Jacobs
d37f007d54 remove #include "mpegvideo.h" where it is not needed
Originally committed as revision 12321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 00:07:53 +00:00
Aurelien Jacobs
3bfe9260fa move relevant declarations to mpeg12data.h
Originally committed as revision 12320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 00:06:09 +00:00
Aurelien Jacobs
6d93461504 move run length table constants to rl.h
Originally committed as revision 12319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 23:58:12 +00:00
Aurelien Jacobs
288a44fb7a move ff_emulated_edge_mc() to dsputil
Originally committed as revision 12318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 23:10:47 +00:00
Michael Niedermayer
8d4bef64b4 Remove unused elements from tables.
Originally committed as revision 12317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 22:09:54 +00:00
Michael Niedermayer
6a287b739f Detect and prevent reading over the end of counts_*. We pass the error
through a context variable as this is simpler and i think also faster, but
the return value of functions could be used instead of course.
The code also ensures as a side effect that the AC decoder state does not
become invalid.
This fixes all known crashes. And outputs nothing in case of an error instead
of random noise.

Originally committed as revision 12316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 21:58:34 +00:00
Michael Niedermayer
1a2a1d9077 Prevent segfault due to reading over the end of the input buffer.
Originally committed as revision 12315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 21:39:21 +00:00
Aurelien Jacobs
7998988129 fix wmv3 dependencies
Originally committed as revision 12314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 18:38:32 +00:00
Aurelien Jacobs
49c35f16fc Fix compilation on powerpc.
DECLARE_ALIGNED_8 is not defined at that point, but this code is powerpc
only, so it's really equivalent to DECLARE_ALIGNED(16...

Originally committed as revision 12313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 18:35:12 +00:00
Aurelien Jacobs
015d0bb95c remove old draw_edges declaration cruft
Originally committed as revision 12312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 10:54:51 +00:00
Aurelien Jacobs
4c79b95c32 move ff_init_scantable() into dsputil
Originally committed as revision 12311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 10:26:56 +00:00
Aurelien Jacobs
5a6a9e78ab move draw_edges() into dsputil
Originally committed as revision 12309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 00:07:41 +00:00
Aurelien Jacobs
ce7f71a2dd dsputil.h is a local header
Originally committed as revision 12308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 23:14:25 +00:00
Aurelien Jacobs
c8deab7af7 include required header
Originally committed as revision 12307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 23:10:13 +00:00
Måns Rullgård
0e9fbd35b5 remove invalid free() forgotten in r12300
Originally committed as revision 12303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 21:54:18 +00:00
Michael Niedermayer
f15e6b869f Provide non null class name to avoid crash with ffmpeg -h.
Originally committed as revision 12300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 19:53:27 +00:00
Justin Ruggles
d8870f120e use scale factor instead of sum for downmix level adjustment. avoids division
inside downmix loop. 7% faster 5.1-to-stereo downmixing.

Originally committed as revision 12287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 16:10:19 +00:00
Justin Ruggles
9d10e6e6c0 pre-calculate downmix coefficient sums. 2% faster 5.1-to-stereo downmixing.
Originally committed as revision 12286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 15:48:18 +00:00
Justin Ruggles
a4de6dd2c1 Use 24-bit fixed-point transform coefficients until just before MDCT. This
gives 7% faster decoding on average.

Originally committed as revision 12284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 04:39:39 +00:00
Loren Merritt
be0995b166 more aspect ratios added in one of the ammendments
Originally committed as revision 12282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 01:58:25 +00:00
Benoit Fouet
79aeec0839 Make AMR-NB block size const and 8 bits.
Originally committed as revision 12278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-29 08:01:01 +00:00
Benoit Fouet
675bc0bccb Define block size for AMR-WB (use IF2 table).
Spotted by John Fitzgerald: jjfitzgerald gmail com

Originally committed as revision 12277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-29 07:59:29 +00:00
Michael Niedermayer
b5a33ff124 suppress the second warning
Originally committed as revision 12276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 23:44:52 +00:00
Reimar Döffinger
7e14b8082d Use cltd instead of cdq asm mnemonic, ICC and gcc support both, but
SunStudio 12 only supports the former.

Originally committed as revision 12275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 17:01:35 +00:00
Baptiste Coudurier
48026fbef6 1000l parenthesis
Originally committed as revision 12274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 16:11:56 +00:00
Baptiste Coudurier
83f02883df code is ok for 4bpp in mov too, fix 16grey.mov
Originally committed as revision 12273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 16:08:52 +00:00
Benjamin Larsson
800b9c24b7 Add more riff IDs to support remuxing.
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 20:34:44 +00:00
Michael Niedermayer
b85976ba64 better include
Originally committed as revision 12257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 23:51:59 +00:00
Michael Niedermayer
3635791a99 include dependencies ...
Originally committed as revision 12256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 23:49:41 +00:00
Diego Biurrun
c91d512b36 Add multiple inclusion guards.
Originally committed as revision 12255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 23:17:08 +00:00
Diego Biurrun
dc3f320dfd Add explanatory comment to '#define FLOAT float'.
Originally committed as revision 12254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 22:52:01 +00:00
Måns Rullgård
800c289a66 less preprocessor magic in version number macros
Originally committed as revision 12246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 20:37:59 +00:00
Michael Niedermayer
499e4700ef Stuffing bytes to not violate minimum legality rate.
Note, this is a joke and not related to MPEG CBR.

Originally committed as revision 12244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 20:17:30 +00:00
Michael Niedermayer
cc6116756c Remove another temporary variable with which gcc has problems.
Originally committed as revision 12243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:36:58 +00:00
Diego Biurrun
94ae6788e2 cosmetics: Demplayerify indentation.
Originally committed as revision 12240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 17:56:00 +00:00
Diego Biurrun
301df48074 Add comments to some #endif directives.
Originally committed as revision 12239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 17:13:42 +00:00
Diego Biurrun
e6464f8b5e cosmetics: spelling/grammar
Originally committed as revision 12238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 17:06:31 +00:00
Michael Niedermayer
c3a3d34427 Alternative and faster (on gcc x86) plane rotation.
Originally committed as revision 12237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 15:52:37 +00:00
Michael Niedermayer
8af4d0fc8d Get rid of another useless variable.
Originally committed as revision 12236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 15:44:49 +00:00
Michael Niedermayer
92ac614f85 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
code is exactly the same just uses different variables.

Originally committed as revision 12235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 15:32:34 +00:00
Michael Niedermayer
e6d7ef648c One variable less. No real change to the actual code.
Originally committed as revision 12234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 15:19:37 +00:00
Michael Niedermayer
6f08c541b4 floating point AAN IDCT
Originally committed as revision 12233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:59:11 +00:00
Loren Merritt
042e0adda9 decode mng color decorrelation
Originally committed as revision 12228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 10:21:33 +00:00
Diego Biurrun
d248905ba5 Remove START_TIMER and STOP_TIMER macros.
Originally committed as revision 12227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 09:35:21 +00:00
Loren Merritt
00829b9bc1 simplify
Originally committed as revision 12224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 07:35:56 +00:00
Aurelien Jacobs
97d1d009e2 split encoding part of dsputil_mmx into its own file
Originally committed as revision 12223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 23:14:22 +00:00
Diego Biurrun
4847a997aa Remove commented-out av_log calls.
Originally committed as revision 12222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 22:44:35 +00:00
Michael Niedermayer
b6bffc46b8 Fix trellis quant + AAN DCT.
Originally committed as revision 12221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 22:43:42 +00:00
Michael Niedermayer
2936438a38 Make diego happy.
Originally committed as revision 12220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 22:32:52 +00:00
Aurelien Jacobs
57b98634c4 compile various fdct only when encoders are enabled
Originally committed as revision 12219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 21:43:19 +00:00
Michael Niedermayer
062942e782 Clarify which BSD license.
Originally committed as revision 12214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 14:59:04 +00:00
Michael Niedermayer
5b0d04d308 Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute
SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap).

Originally committed as revision 12212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 14:42:12 +00:00
Loren Merritt
4a5b619df7 png filters
Originally committed as revision 12195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 10:34:23 +00:00
Måns Rullgård
76a448ed4f Install headers in $prefix/include/$libname
Install each library's headers in $prefix/include/$libname.
The installed headers use #include "lib*/*.h"; applications
are expected to do the same.

Specify only $prefix/include in .pc files.

Originally committed as revision 12194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 09:22:11 +00:00
Loren Merritt
bd58e7f730 remove a memcpy
Originally committed as revision 12193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 05:46:53 +00:00
Måns Rullgård
6f4e2b5a95 fix memory leaks in vp3 decoder
Originally committed as revision 12191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 18:56:52 +00:00
Reimar Döffinger
f2217d6f90 __asm __volatile -> asm volatile part 2
Originally committed as revision 12189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 14:47:42 +00:00
Reimar Döffinger
78d3d94f14 __asm __volatile -> asm volatile, improves code consistency and works
(as far as that is possible) with the Sun C compiler.

Originally committed as revision 12188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 14:46:22 +00:00
Vitor Sessak
cf73e32a5f Fix bug I introduced in r11962.
Thanks to Uoti Urpala for spotting it and proposing the
fix.

Originally committed as revision 12187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 07:47:02 +00:00
Benjamin Larsson
7bb8d51c1f Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers.
Originally committed as revision 12182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-23 23:30:41 +00:00
Michael Niedermayer
a939a005f9 Remove apparently unneeded and buggy align.
Originally committed as revision 12179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-22 19:27:22 +00:00
Loren Merritt
917f55cc03 cleaner way of writing packed-byte constants.
suggested by Uoti Urpala

Originally committed as revision 12177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-22 16:53:26 +00:00
Loren Merritt
31304587da indent
Originally committed as revision 12166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-21 07:55:42 +00:00
Loren Merritt
469bd7b150 pseudo-simd add_bytes and diff_bytes
2x faster than scalar in 32bit, 4x faster in 64bit (as opposed to 8x in mmx)

Originally committed as revision 12165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-21 07:54:46 +00:00
Loren Merritt
4a9ca0a279 simd and unroll png_filter_row
cycles per 1000 pixels on core2:
left: 9211->5170
top: 9283->2138
avg: 12215->7611
paeth: 64024->17360
overall rgb png decoding speed: +45%
overall greyscale png decoding speed: +6%

Originally committed as revision 12164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-21 07:10:46 +00:00
Michael Niedermayer
1435e4ccde Disabling all SSE* code for old gcc to avoid alignment issues.
Originally committed as revision 12163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-21 00:06:07 +00:00
Michael Niedermayer
635fbcb17f revert 12156
Log:
Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.
----
A IMHO cleaner solution has been implemented.

Originally committed as revision 12162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 20:24:38 +00:00
Michael Niedermayer
bdd745da60 Forgot this, which is needed for merging field pics too.
Originally committed as revision 12161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 19:48:25 +00:00
Michael Niedermayer
21da962cf1 Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
field pictures much more digestable.

Originally committed as revision 12160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 19:45:38 +00:00