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

26210 Commits

Author SHA1 Message Date
José Miguel Gonçalves
70f77361d8 Allow to set the frame rate in v4l2 devices
Patch by José Miguel Gonçalves (jose DOT goncalves AT inov DOT pt)

Originally committed as revision 25159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 09:16:05 +00:00
Richard Buteau
6ac6e3d123 Fix aspect ratio for files that have it stored in
ff_asf_extended_content_header.
Fixes issue 690.

Patch by Richard Buteau, rbuteau rgbnetworks com

Originally committed as revision 25158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 03:40:06 +00:00
Ronald S. Bultje
9c193cc47c Fix typo (instruciton -> instruction).
Originally committed as revision 25157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-22 02:18:03 +00:00
Ivan Kalvachev
392c99007f The debug text output of macroblocks can indicate MB_TYPE_INTERLACED,
but it used to do it only for h264 codec.
Allow it for other codecs, as mpeg2 and mpeg4 also set this flag.

Originally committed as revision 25156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-21 22:44:27 +00:00
Diego Biurrun
26d5112c57 cosmetics: Place concat protocol entry in alphabetical order.
Originally committed as revision 25155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-21 22:21:12 +00:00
Martin Storsjö
b416267622 tcp: Check both wfds and efds when waiting for the result from connect
On windows, a connection failure doesn't trigger wfds as it does on unix.

This fixes issue 2237, based on code by yeyingxian.

Originally committed as revision 25154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-21 20:17:34 +00:00
Måns Rullgård
c0bc8b9afb x86: disable SSE functions using stack when stack is not aligned
This fixes crashes with ICC 10.1.

Originally committed as revision 25153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-21 17:57:21 +00:00
Måns Rullgård
bdefad7366 Disable ALIGNED_STACK with icc 10 or prior on x86_32
Originally committed as revision 25152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-21 17:57:17 +00:00
Måns Rullgård
59782b828b Add HAVE_ALIGNED_STACK config setting
This is set to 1 if the stack is guaranteed to be suitably aligned
for the strictest access mode of the machine.

Originally committed as revision 25151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-21 17:57:13 +00:00
Måns Rullgård
75c490f467 ARM: disable movw/movt for relocated values on Apple platforms
Apparently Apple platforms do not handle movw/movt relocations
properly, leading to runtime crashes in code using them.

Originally committed as revision 25150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-20 21:50:46 +00:00
Stefano Sabatini
1790d3b330 Move log_callback_help to cmdutils.[hc], for allowing sharing.
Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-20 21:48:03 +00:00
Benjamin Larsson
4792d1e792 Support deinterlacing of YUVJ420P.
Originally committed as revision 25148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-20 11:34:27 +00:00
Martin Storsjö
63206a8ffb Check for the IPPROTO_IPV6 define before using it
This fixes building on FreeBSD in some configurations, if the IPv6 multicast
structs are available, but IPPROTO_IPV6 isn't defined.

Originally committed as revision 25147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-20 06:38:40 +00:00
Måns Rullgård
f41237c9db x86: remove hack disabling sse2 h264 loop filter with 32-bit icc
Originally committed as revision 25146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-18 20:44:32 +00:00
Måns Rullgård
217d3d8fe9 Request 16-byte aligned stack with icc on x86_32
Originally committed as revision 25145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-18 20:44:29 +00:00
Justin Ruggles
ff19d16b91 10l: error in last commit. use decoder channels not encoder channels.
Originally committed as revision 25144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-18 20:19:18 +00:00
Justin Ruggles
37f5a713de Change remaining ost->st->codec and ist->st->codec to enc and dec in
do_audio_out().

Originally committed as revision 25143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-18 20:16:56 +00:00
Lou Logan
61410787b8 Remove legacy x264 presets
Since we now have the official x264 presets in ffmpeg, there's no reason to
keep around the old ones.

Patch by Lou Logan <lou AT fakeoutdoorsman DOT com>.

Originally committed as revision 25142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-17 20:14:24 +00:00
Vitor Sessak
6e2ecc2dba Remove pointless semicolon
Originally committed as revision 25141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-17 19:33:56 +00:00
Ronald S. Bultje
ada65af9d1 Don't access upper 32 bits of a 32-bit int on 64-bit systems.
Originally committed as revision 25140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-17 12:24:22 +00:00
James Darnley
8328ad1370 configure: print minimum lame version number required after revision 25128
Patch by James Darnley <james dot darnley at gmail dot com>.

Originally committed as revision 25139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-17 10:52:43 +00:00
Ronald S. Bultje
6c3d021891 Properly add HAVE_YASM around yasmified symbols. Should fix compile error
on configurations using --disable-yasm.

Originally committed as revision 25138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-17 03:01:57 +00:00
Ronald S. Bultje
e2e341048e Move hadamard_diff{,16}_{mmx,mmx2,sse2,ssse3}() from inline asm to yasm,
which will hopefully solve the Win64/FATE failures caused by these functions.

Originally committed as revision 25137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-17 01:56:06 +00:00
Ronald S. Bultje
d0acc2d2e9 Move sse16_sse2() from inline asm to yasm. It is one of the functions causing
Win64/FATE issues.

Originally committed as revision 25136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-17 01:44:17 +00:00
Måns Rullgård
6de163e9bf configure: detect Open64 compiler
Originally committed as revision 25135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16 15:25:10 +00:00
Ramiro Polla
b9f5e3bd75 swscale-test: cosmetic alignment
Originally committed as revision 32265 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-16 13:30:02 +00:00
Stefano Sabatini
dcb90374a3 Cosmetics: fix weird align.
Originally committed as revision 25134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16 08:47:37 +00:00
Stefano Sabatini
e6c4a417b3 Use <> for system headers inclusion.
Originally committed as revision 25133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16 08:47:34 +00:00
Stefano Sabatini
0a7d6e01a3 Fix copyright notice, make it more consistent with the rest of FFmpeg.
Originally committed as revision 25132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16 08:47:31 +00:00
Stefano Sabatini
58d9436447 Fix grammar in the ocv_smooth filter documentation.
Originally committed as revision 25131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16 08:37:15 +00:00
Stefano Sabatini
b109427524 Prefer "X" over ``X'', looks more readable and more consistent with
the rest of FFmpeg docs.

Originally committed as revision 25130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16 08:34:55 +00:00
Carl Eugen Hoyos
eb6fb058f2 Remove useless comment.
Originally committed as revision 25129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16 08:30:01 +00:00
Ramiro Polla
5a90173751 swscale: remove useless temporary variable
Originally committed as revision 32258 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-16 01:09:59 +00:00
Ramiro Polla
cf1cd520c6 swscale: factorize plane copying code out of 2 functions
Originally committed as revision 32257 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-16 01:07:55 +00:00
Ramiro Polla
f1084cb0cd swscale-test: always use bilinear scaler to get output for SSD
Originally committed as revision 32256 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-16 00:41:08 +00:00
James Darnley
efec9ac8a9 Allow float values for libmp3lame quality.
Patch by James Darnley, james D darnley A gmail

Originally committed as revision 25128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 22:10:13 +00:00
Justin Ruggles
6c834328b9 Allow audiogen to take commandline parameters for sample rate and number of
channels.

Originally committed as revision 25127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 21:36:04 +00:00
Martin Storsjö
160918d588 rtsp: Handle standard assigned codec names for private payload types, too
Originally committed as revision 25126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 17:39:25 +00:00
Martin Storsjö
0048a2a8d3 Handle G.722 in RTP, and all the exceptions mandated in RFC 3551
Originally committed as revision 25125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 17:35:39 +00:00
Reimar Döffinger
82eac2f321 Check avctx width/height more thoroughly (e.g. all values 0 except width would
have been accepted before).
Also do not fail if they are invalid but instead override them to 0.
This allows decoding e.g. MPEG video when only the container values are corrupted.
For encoding a value of 0,0 of course makes no sense, but was allowed
through before and will be caught by an extra check in the encode function.

Originally committed as revision 25124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 04:46:55 +00:00
Michael Niedermayer
4faf628f20 Clarify what av_read_frame() returns.
Originally committed as revision 25123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 22:20:46 +00:00
Måns Rullgård
180ec37dff Update pathscale compiler detection
Originally committed as revision 25122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 18:55:20 +00:00
Måns Rullgård
4a6cc8fa25 ARM: fix NEON h264_idct_add8
Originally committed as revision 25121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 17:11:51 +00:00
Tomas Härdin
bc6f0af289 Add av_popcount() to libavutil/common.h and bump minor version
Originally committed as revision 25120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 14:45:43 +00:00
Ronald S. Bultje
1d16a1cf99 Rename h264_idct_sse2.asm to h264_idct.asm; move inline IDCT asm from
h264dsp_mmx.c to h264_idct.asm (as yasm code). Because the loops are now
coded in asm instead of C, this is (depending on the function) up to 50%
faster for cases where gcc didn't do a great job at looping.

Since h264_idct_add8() is now faster than the manual loop setup in h264.c,
in-asm idct calling can now be enabled for chroma as well (see r16207). For
MMX, this is 5% faster. For SSE2 (which isn't done for chroma if h264.c does
the looping), this makes it up to 50% faster. Speed gain overall is ~0.5-1.0%.

Originally committed as revision 25119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 13:36:26 +00:00
Stefano Sabatini
6ebf0bfc17 Implement libopencv smooth filter.
Originally committed as revision 25118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 13:21:13 +00:00
Ramiro Polla
c12f7b2d2c rgb2rgb: don't misuse HAVE_* defines
Introduce and use COMPILE_TEMPLATE_* instead.

Originally committed as revision 32241 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-14 13:12:11 +00:00
Michael Niedermayer
c157fe6356 Limit av_log repeat detection to terminals so as to avoid filling files with
lots of mess.

Originally committed as revision 25117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 00:17:58 +00:00
Carl Eugen Hoyos
6639af56ea Reindent after r25115.
Originally committed as revision 25116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-13 22:09:28 +00:00
Zhou Zongyi
4383692896 Add R10k decoder.
Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by
James Darnley, james.darnley gmail, changes by me.

Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-13 22:08:51 +00:00