Commit Graph

384 Commits

Author SHA1 Message Date
Benoit Fouet
d99b81664b Pass avf context to audio_open().
Originally committed as revision 16694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 08:00:59 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Aurelien Jacobs
49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 17:19:17 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Luca Abeni
e7b987dc2f Remove the frame rate from struct video_data, and allow using a variable
frame rate for video4linux2 input

Originally committed as revision 16464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 13:34:29 +00:00
Stefano Sabatini
5d91e92853 Use avcodec_check_dimensions() for checking the frame size validity.
The v4l.c check is moved after the eventual automatic size detection,
so the check in that case is performed on the new set values.

Originally committed as revision 16370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 14:41:19 +00:00
Stefano Sabatini
df77a6daab Make the VIDIOCMCAPTURE ioctl error message consistent with the other ones.
Originally committed as revision 16361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 11:44:56 +00:00
Stefano Sabatini
faf67322dc Add missing check on the return value of the VIDIOCSWIN ioctl.
Originally committed as revision 16360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 11:40:07 +00:00
Stefano Sabatini
df2a3f2714 Use more descriptive long_names for Video4Linux input devices.
Originally committed as revision 16322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 11:23:50 +00:00
Stefano Sabatini
7274a48035 Check that the device is a capture device immediately after opening
the device.

Originally committed as revision 16318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 10:12:57 +00:00
Stefano Sabatini
f233d34821 Remove unnecessary temporary variable "frame_size" from
grab_read_header().

Originally committed as revision 16317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 09:31:21 +00:00
Stefano Sabatini
fd867ffd43 Add missing check on the result of a VIDIOCCAPTURE ioctl.
Originally committed as revision 16316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 09:12:12 +00:00
Stefano Sabatini
c40432d30c Cosmetics: put a space after each comma, improve consistency and
readability.

Originally committed as revision 16315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 09:07:51 +00:00
Stefano Sabatini
7bbacf9a0c Implement size autodetection if one of the width and height
AVFormatParameters for grab_read_header() is non-positive.

Originally committed as revision 16199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 23:58:28 +00:00
Stefano Sabatini
406c580854 Replace the width and height fields in VideoData with a struct
video_window video_win field.

Originally committed as revision 16198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 23:51:19 +00:00
Stefano Sabatini
9580ba2676 Replace frame_rate and frame_rate_base fields in VideoData with an
AVRational time_base field.

Originally committed as revision 16197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 23:43:56 +00:00
Diego Biurrun
616deed28f Do not invade _t POSIX namespace.
Originally committed as revision 16109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 18:16:06 +00:00
Reimar Döffinger
eb857782e7 Define _BSD_SOURCE in bktr.c, dev/ic/bt8xx.h needs the u_short etc. typedefs,
which sys/types.h will not generate without this.

Originally committed as revision 16089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 09:16:12 +00:00
Stefano Sabatini
b9f382c8ef Remove unnecessary ret variable.
Originally committed as revision 16033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-07 22:52:32 +00:00
Ramiro Polla
bc4b722143 mingw: update w32api to 3.13
Originally committed as revision 16029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-07 05:17:57 +00:00
Måns Rullgård
c87348a922 Use OBJS variable for all object files
There is no longer any need to differentiate the object files
by source type.

Originally committed as revision 15708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 14:00:28 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Jens Rosenboom
3d0d9a5e3b The v4l2 driver can silently change the pixel format in the
VIDIOC_S_FMT ioctl(). In this case, device_init() should fail so that
a different pixel format is tried.
Patch by Jens Rosenboom (jens DOT rosenboom AT eu DOT panasonic DOT com)

Originally committed as revision 15660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 07:59:41 +00:00
Alexis Ballier
d84b1cb3da Add missing sys/select.h #include, fixes compilation on FreeBSD 7.0.
patch by Alexis Ballier, alexis.ballier gmail com

Originally committed as revision 15649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-20 05:26:52 +00:00
Diego Pettenò
fb65d2ca84 Use enum typers instead of int.
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail

Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:03:00 +00:00
Baptiste Coudurier
a3250d073d sync to latest mingw api, remove unneeded struct definitions
Originally committed as revision 15423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 03:20:35 +00:00
Brad
1b6e8b734c V4L2 support for OpenBSD, patch by Brad, brad comstyle com
Originally committed as revision 15376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-21 22:47:52 +00:00
Baptiste Coudurier
00adc1e5dc set bits_per_coded_sample according to new lavc api
Originally committed as revision 15289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 18:32:50 +00:00
Jean Delvare
92d04e765e Add support for the RGB32 pixel format in video4linux2 devices
Patch by Jean Delvare (khali AT linux-fr DOT org)

Originally committed as revision 15219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 20:40:50 +00:00
Jean Delvare
97a290efcb Add support for the PIX_FMT_RGB555 and PIX_FMT_RGB565 pixel formats in
video4linux2 devices.
Patch by Jean Delvare (khali AT linux-fr DOT org)

Originally committed as revision 15218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 20:36:42 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
Michael Niedermayer
e9d4b8a533 Workaround bug in types.h that has typedef __u64 under #ifndef __STRICT_ANSI__.
Originally committed as revision 14852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 21:20:39 +00:00
Diego Biurrun
29a717aef2 Use '#include <poll.h>' instead of '#include <sys/poll.h>'.
It is the standard location as defined by the Open Group.

Originally committed as revision 14761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 15:50:31 +00:00
Aurelien Jacobs
ea452b54f0 strcasecmp() requires #include <strings.h>
Originally committed as revision 14728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 17:22:53 +00:00
Stefano Sabatini
b3b990b659 Implement avdevice_version().
Originally committed as revision 14668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 18:42:31 +00:00
Stefano Sabatini
3241ec1d6f Cosmetics: make a v4l2 error message consistent with r14647.
Originally committed as revision 14664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 18:14:21 +00:00
Benoit Fouet
c57c489753 Change OSS long names.
Originally committed as revision 14663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 12:52:12 +00:00
Benoit Fouet
0f680571fa Remove useless 'channels' assignment.
Originally committed as revision 14656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-07 06:56:37 +00:00
Stefano Sabatini
99423fa0ee Distinguish the error reporting for the cases of wrong size and wrong
timebase in the video4linux2 v4l2_read_header() function.

Originally committed as revision 14647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 18:21:35 +00:00
Stefano Sabatini
e78d651f06 Distinguish the error reporting for the cases of wrong size and wrong
timebase in the video4linux grab_read_header() function.

Originally committed as revision 14646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 18:20:04 +00:00
Diego Biurrun
ca74c0a180 cosmetics: Fix two common typos: wont --> will not, lets --> let us.
Originally committed as revision 14372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 17:09:28 +00:00
Stefano Sabatini
deaab5fc32 Make v4l2_read_header() don't free a stream in case of failure when
reading its header. The stream will be freed later in
av_open_input_stream(). Fix a segmentation fault due to a double free
on the same pointer.

Originally committed as revision 14247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-15 20:45:42 +00:00
Stefano Sabatini
7c1d608ece Make v4l_read_header() don't free a stream in case of failure when
reading its header. The stream will be freed later in
av_open_input_stream(). Fix a segmentation fault due to a double free
on the same pointer.

Originally committed as revision 14246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-15 20:39:20 +00:00
Erik Hovland
72e043dd0f One-bit bitfields should probably be unsigned. Unfortunately, it is left
up to the compiler on how one bit fields are treated. gcc treats one-bit
bitfields as signed and allows for the -funsigned-field parameter. Other
compilers (like Sun C) treat one-bit bitfields as unsigned no matter what.
Patch by Erik Hovland erik hovland org

Originally committed as revision 14131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 23:20:22 +00:00
Stefano Sabatini
44555f098c Add missing SMALL_IF_CONFIG_SMALL macros for beosaudio long_names.
Originally committed as revision 13795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-17 10:14:29 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Carl Eugen Hoyos
eacced45c4 Replace some occurrences of -1 with PIX_FMT_NONE.
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 22:28:43 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Diego Biurrun
4f78608632 #include required headers directly.
Originally committed as revision 13078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 10:09:30 +00:00
Diego Biurrun
9aed96128f prettyprinting cosmetics
Originally committed as revision 13077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 10:02:29 +00:00
Diego Biurrun
1f9449234e Remove unused avdevice.h header file; add config.h which is used.
Originally committed as revision 13006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 11:52:35 +00:00
Ramiro Polla
4b1131a075 typo
Originally committed as revision 12823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 16:20:58 +00:00
Ramiro Polla
cada03275e Add #if 0 code to test for yet unsupported compressions
from user-supplied verbose information.

Originally committed as revision 12822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 15:44:33 +00:00
Ramiro Polla
23ef6da836 Support biCompression I420
Originally committed as revision 12821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 15:41:10 +00:00
Ramiro Polla
e4d286f1c7 Cosmetics: remove {}s over one-lined ifs.
Originally committed as revision 12820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 15:13:06 +00:00
Ramiro Polla
e110f48608 Simplify more errors by using goto
Originally committed as revision 12819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 15:07:12 +00:00
Ramiro Polla
76c2662b48 Simplify returning errors by using goto
Originally committed as revision 12818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 14:59:51 +00:00
Måns Rullgård
71c61f62a3 non-recursive makefiles
Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:16:31 +00:00
François Revol
0d14ab27a8 Fix building with C++ objects, variable names were inconsistent.
Originally committed as revision 12608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 16:10:18 +00:00
Diego Biurrun
0e58bf670d Remove #ifdef HAVE_SYS_MMAN_H around sys/mman.h #include.
Without the #include compilation fails.

Originally committed as revision 12568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-24 10:54:01 +00:00
Diego Biurrun
362b3bf757 Remove unneeded sys/mman.h #include.
Originally committed as revision 12567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-24 10:50:16 +00:00
Diego Biurrun
b00675499c Only #include sys/mman.h if configure set HAVE_SYS_MMAN_H.
Originally committed as revision 12521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 19:07:24 +00:00
Diego Biurrun
63d026b1bf cosmetics: #include config.h before all other FFmpeg headers.
Originally committed as revision 12450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 16:17:02 +00:00
Diego Biurrun
bd10713636 typo fixes
Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 16:15:47 +00:00
Ramiro Polla
d76c3e077e Correctly handle case where buffer is 100% full
Originally committed as revision 12389 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 23:06:33 +00:00
Ramiro Polla
c234520736 VFW capture support
Originally committed as revision 12384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 22:10: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
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
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
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
Måns Rullgård
e97ac1e6f5 Clean up lib* version definitions
Updating version numbers now requires changing only one place.

Originally committed as revision 12154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:50:28 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 09:26:10 +00:00
Benoit Fouet
e2d3e82dfd More verbose error log message.
Originally committed as revision 11556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-18 11:27:28 +00:00
Michel Bardiaux
48f7e1aeee Clarify the error message when video width, height, or framerate are not
specified.
Patch by Michel Bardiaux (mbardiaux AT mediaxim DOT be)

Originally committed as revision 11551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-17 16:27:26 +00:00
Víctor Paesa
a585c469a3 Link to libraries in dependency order.
Based on a patch by Gonzalo Garramuño, ggarra advancedsl com ar

Originally committed as revision 11515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-12 11:17:37 +00:00
Alessandro Sappia
cbe3f0b8ec Enabling higher frame rates for dc1394, patch by Alessandro Sappia a dot sappia at ngi dot it
Originally committed as revision 11502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 02:13:32 +00:00
Alessandro Sappia
0b4a18218e Adding support for libdc1394 v.2, patch by Alessandro Sappia a dot sappia at ngi dot it
Originally committed as revision 11501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:59:05 +00:00
Roman Shaposhnik
43d1a1c05a * fixing a bug preventing default values to be set correctly
Originally committed as revision 11461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 02:52:05 +00:00
Diego Pettenò
1411f55b63 Make v4l.c's video_formats constant and static.
Patch by Diego 'Flameeyes' Pettenò flameeyes ¤ gmail ! com

Originally committed as revision 11443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 12:42:02 +00:00
Michael Niedermayer
3ab64e46e2 Remove AIW support code, it is unfit for ffmpeg svn, doing usleep() and
colorspace convertion and deinterlacing in the demuxer. Whoever wants
AIW support has to implement this cleanly!

Originally committed as revision 11335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-28 03:30:23 +00:00
Vitor Sessak
52b541ad79 spelling
Originally committed as revision 11122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01 22:21:04 +00:00
Luca Abeni
23c0634c78 Link libavdevice against libavutil, libavcodec, and libavformat
(fix compilation for non-ELF targets).

Originally committed as revision 11085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-23 12:55:50 +00:00
Luca Abeni
c4035e5d3f Fix the creation of alldevices.c (create it without any rename).
This also requires some changes to configure

Originally committed as revision 11080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-23 08:07:23 +00:00
Luca Abeni
c721d803cb Introduce libavdevice
Originally committed as revision 11077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-22 16:10:02 +00:00