Commit Graph

24164 Commits

Author SHA1 Message Date
Alex Converse
2d23fecd5d Enforce time border monotonicity.
Thanks to Chromium.

Originally committed as revision 23000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 23:32:42 +00:00
Alex Converse
a91d82b5cc Move the SBR patch count check to prevent overwrites.
Thanks to Chromium.

Originally committed as revision 22999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 23:08:44 +00:00
Alex Converse
10678e5c72 Increase size of patch_borders[].
6 patches means there can be 7 borders. Found by Chromium.

Originally committed as revision 22998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 22:42:52 +00:00
Michael Niedermayer
19a00c5eb2 avi bgr24 padding fix.
Fixes issue1901

Originally committed as revision 22997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 22:09:42 +00:00
Alex Converse
d0dedce71d Reindent
Originally committed as revision 22996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:43:29 +00:00
Alex Converse
ca6d3f234c Rewrite ff_sbr_apply in a manner more friendly to PS.
This includes merging ff_sbr_dequant into ff_sbr_apply.

Originally committed as revision 22995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:43:23 +00:00
Alex Converse
bd744c4fd0 Declare myself (Alex Converse) AAC maintainer.
Approved by the previous maintainer Rob.

Originally committed as revision 22994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:43:18 +00:00
Måns Rullgård
5635985c26 ARM: NEON optimised VP6 edge filter
Originally committed as revision 22993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:30:27 +00:00
Måns Rullgård
5e1ba34bbb VP56: move vp56_edge_filter to new VP56DSPContext
Using macro templates allows the vp[56]_adjust functions to be
inlined instead of called through function pointers.  The new
function pointers enable optimised implementations of the filters.

4% faster VP6 decoding on Cortex-A8.

Originally committed as revision 22992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:30:22 +00:00
Michael Niedermayer
ff866063e9 Print warnig if requested samplingrate is unsupported.
Originally committed as revision 22991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 00:06:36 +00:00
Måns Rullgård
547b7bcbb7 bswap: add macros to byteswap constants
The normal byteswap functions might use inline asm which is suboptimal
with constants (and cannot be used in static initialisers), so special
macros for constants only is needed.

We should not rely on the gcc __builtin_constant_p() test since it is
not always available.

Originally committed as revision 22990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-29 14:41:20 +00:00
Ramiro Polla
faa2989e0f vfwcap: flip RGB rawvideo.
Originally committed as revision 22989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-29 13:05:27 +00:00
Jai Menon
707cd944d6 Fix typo.
Originally committed as revision 22988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 20:08:02 +00:00
Michael Niedermayer
2308b6c19a Add version to AVClass so we can add to and use fields of AVClass without ABI issues.
Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 20:00:23 +00:00
Luca Abeni
b01dba14f3 Check the return value of device_try_init() immediately after calling such a
function. Avoids the following warning:
libavdevice/v4l2.c: In function ‘v4l2_read_header’:
libavdevice/v4l2.c:586: warning: ‘codec_id’ may be used uninitialized in this function

Originally committed as revision 22986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 08:02:52 +00:00
Anssi Hannula
337104ac1f Fix FourCC when remuxing VP6F, regression introduced in r22941.
Patch by Anssi Hannula, anssi D hannula A iki fi

Originally committed as revision 22985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 07:57:07 +00:00
Stefano Sabatini
441881b4f9 Reindent after the last commit.
Originally committed as revision 22984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 23:22:30 +00:00
Stefano Sabatini
8280e2bd45 Make ffprobe show sample_aspect_ratio and display_aspect_ratio only if
sample_aspect_ratio is known.

Avoid to show bogus values, which may confuse both the human and the
machine reader.

Based on a patch by Robert Krüger $(echo lsvfhfs@tjhobm7.ef | tr "b-za" "a-z").

Originally committed as revision 22983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 23:22:27 +00:00
Stefano Sabatini
6e25b78001 Fix weird brace placement.
Originally committed as revision 22982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 22:45:27 +00:00
Stefano Sabatini
cf103fabbe Drop AVERROR_NOTSUPP at the next major bump, use AVERROR(ENOSYS)
instead which is semantically equivalent.

See the thread:
Subject: [FFmpeg-devel] [RFC] The meaning of AVERROR_NOTSUPP
Date: Sat, 27 Mar 2010 00:51:13 +0100

Originally committed as revision 22981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 22:26:08 +00:00
Luca Abeni
1ace15f58c Reduce the verbosity of the v4l2 input device
Originally committed as revision 22980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 21:33:56 +00:00
Luca Abeni
4f54d924bc Simplify some output messages in the v4l2 input device
Originally committed as revision 22979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 21:32:11 +00:00
Sebastian Vater
4f5e6ef16e Reindent after rr22977.
Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 14:04:11 +00:00
Sebastian Vater
46dcabf82b Make the IFF demuxer a little more standards-compliant, e.g. respect the size
fields of common media header chunks (these can have different sizes depending
on the type of IFF file you read), better handle odd sizes (like RIFF, every
field is padded to word) and handle headerchunks after the BODY chunk.

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 14:03:47 +00:00
Sebastian Vater
726dc06158 Reidnent after r22795.
Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:39:08 +00:00
Sebastian Vater
fe51b5ce50 Move some branches outside looped code. Should improve the generated asm (and
thus performance) slightly.

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:38:41 +00:00
Sebastian Vater
473147bed0 Switch some ints to unsigned (they can only have positive values, this allows
compiler to optimize some math from mul/div to shr/shl). Also add a cast to
uint32_t when calling decodeplane32(), this silences a compiler warning.
Lastly, in decodeplane8/32(), flatten a double-loop into a single-loop and
calculate the length once before entering the loop instead of during every
iteration (since it doesn't change).

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:37:13 +00:00
Stefano Sabatini
a31e795607 Make ffmpeg use print_error() to make apparent the exact cause of
failure happened when trying to open the output file.

Originally committed as revision 22973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:36:55 +00:00
Stefano Sabatini
ec6791736c Make file_open() return the error code set in errno if open() fails,
rather than always ENOENT.

Originally committed as revision 22972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:36:51 +00:00
Stefano Sabatini
932d775fa2 Implement v4l2 input size autodetection in v4l2_read_header().
Move check on frame size after the device is opened and after
device_try_init() is attempted. If the provided size value is 0x0,
perform a VIDIOC_G_FMT ioctl() on the device, which sets size to the
current settings.

Originally committed as revision 22971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:07:15 +00:00
Sebastian Vater
687dc3555d Make two functions out of #define hackery.
Patch by Sebastian Vater, cdgs D basty A googlemail

Originally committed as revision 22970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:00:57 +00:00
Ronald S. Bultje
90bc36b063 Reindent after r22968.
Originally committed as revision 22969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 21:01:38 +00:00
Ronald S. Bultje
ad6408960b Write clip-related decimal numbers into hex, where they make more sense.
Originally committed as revision 22968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 21:00:33 +00:00
Måns Rullgård
3bfd582c96 Set ARCH=c with --disable-asm, fix build
Originally committed as revision 22967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 20:30:02 +00:00
Stefano Sabatini
c57a8fefd9 Return meaningful error codes, rather than always -1.
Originally committed as revision 22966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 19:40:15 +00:00
Ronald S. Bultje
2d0525c27c Fix broken 32-bit clipping, and write numbers in hex instead of decimal so
they are easier to understand. Also give the add a 'u' postfix to silence
a pre-c99 compiler warning.

Originally committed as revision 22965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 13:36:17 +00:00
Robert Krüger
0a6a282a51 Make ffprobe show stream->nb_frames if that info is known.
Patch by Robert Krüger $(echo kru3g3r@signal7.d3 | sed -e 's/3/e/g').

Originally committed as revision 22964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 23:35:56 +00:00
Stefano Sabatini
18225025ff Remove unnecessary width and height variables from v4l2_read_header().
Originally committed as revision 22963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 18:47:40 +00:00
Stefano Sabatini
4cf1ba0445 Make avcodec_check_dimensions() return AVERROR(EINVAL) rather than -1
in case of invalid picture size.

Originally committed as revision 22962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 15:05:16 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2()
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 14:27:42 +00:00
Stefano Sabatini
472e12f510 Implement ffserver.c:report_config_error() and a macro for logging
error messages / updating the error count.

Originally committed as revision 22960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-24 10:39:28 +00:00
Stefano Sabatini
6675a5bf73 Statically initialize ffserver.c:config_filename, simplify.
Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-24 10:39:25 +00:00
Stefano Sabatini
931b832add Consistently prefer @var{VAR} over ``VAR'' for indicating filter
parameters.

Originally committed as revision 22958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-24 10:14:05 +00:00
Michael Niedermayer
6204402409 4th try at getting ansi colors working with a default of color=yes_please.
Colors will only be used if the TERM env var is set and NO_COLOR is not set.

Originally committed as revision 22957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 21:27:26 +00:00
Ronald S. Bultje
0bb848016a Add acelp_filters.o as QCELP decoder object file.
Originally committed as revision 22956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 16:45:38 +00:00
Ronald S. Bultje
005ad8a0de Make WMAVoice decoder depend on DCT/RDFT
Originally committed as revision 22955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 16:41:55 +00:00
Måns Rullgård
07876e25c8 Workaround for missing llrintf()
Originally committed as revision 22954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 16:28:10 +00:00
Michael Niedermayer
aebfb45774 Trying _WIN32 for win32 detection.
Originally committed as revision 22953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 13:15:11 +00:00
Michael Niedermayer
7328cdfa58 Merge the 2 ANSI ESC codes.
Originally committed as revision 22952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 08:11:53 +00:00
Michael Niedermayer
841073ce5e Reenable ANSI colors, use method from VLC as suggested by ramiro.
Please tell us asap if this breaks for your platform & terminal.

Originally committed as revision 22951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 07:33:02 +00:00