virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
34,166 Commits 37 Branches 400 Tags 464 MiB
836e8b9ba0
Commit Graph

308 Commits

Author SHA1 Message Date
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
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
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
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Stefano Sabatini
2874c81cc8 Replace all remaining occurrences of AVERROR_NOMEM with 
AVERROR(ENOMEM).

AVERROR_NOMEM is deprecated and will be dropped at the next libavutil
major bump.

Originally committed as revision 22791 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-03 14:15:00 +00:00
Martin Storsjö
fea9bb2f31 Replace the last occurrance of CODEC_TYPE_ with AVMEDIA_TYPE_ 
Originally committed as revision 22776 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 13:33:51 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Stefano Sabatini
bd01c39330 Make audio_read_packet() return AVERROR_EOF rather than AVERROR(EOF) = 
AVERROR(-1) = 1.

Originally committed as revision 22664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 00:41:54 +00:00
Ramiro Polla
85f273c7ca x11grab: AVFormatParameters are always passed from av_open_input_stream(), 
there is no need to check for it.

Originally committed as revision 22651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 23:35:36 +00:00
Diego Biurrun
e547328b18 Revert removal of _NETBSD_SOURCE definition. 
It is indeed necessary to compile on NetBSD.

Originally committed as revision 22613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-21 09:24:04 +00:00
Ramiro Polla
ad8eede7b1 vfwcap: Free remaining packets on vfw_read_close(). 
Originally committed as revision 22575 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-17 04:36:06 +00:00
Ramiro Polla
ce03ed4df1 Do not store a copy of AVFormatContext *s in vfw_ctx. 
Save *s directly in SetWindowLongPtr instead.

Originally committed as revision 22574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-17 04:24:43 +00:00
Stefano Sabatini
5ae092ee34 Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark 
AVERROR_EIO for deletion at the next major bump.

Originally committed as revision 22513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 19:19:44 +00:00
Diego Biurrun
4f4e40085f Replace BSD-specific integer types by their POSIX equivalents. 
Mark bktr_init function as av_cold.
Tested to work by Michael Kostylev on the NetBSD FATE box.

Originally committed as revision 22487 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 17:29:19 +00:00
Diego Biurrun
2138dc99fc Add _XOPEN_SOURCE=600 to CPPFLAGS on NetBSD. 
This make NetBSD compile out of the box at the cost of a hack, but a
locally contained one that is preferable to the one used in the wild.
Currently the NetBSD FATE box adds -D_NETBSD_SOURCE to CPPFLAGS to work
around broken system headers. Since it is unlikely for NetBSD to fix their
headers, it is better to use a standard flag instead of a system-specific one.

As a sideeffect, this allows getting rid of a local _NETBSD_SOURCE definition.

Originally committed as revision 22486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 17:28:02 +00:00
Ramiro Polla
e24080f00e vfwcap: Add support for UYVY pixel format. 
Originally committed as revision 22424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 05:25:06 +00:00
Måns Rullgård
c26e58e32c Add some missing #includes 
Originally committed as revision 22258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:36 +00:00
Jorge Acereda
d5963ee64a Add _NETBSD_SOURCE definition to fix compilation on NetBSD. 
NetBSD is unlikely to fix their headers and the FATE box passes it
as -D_NETBSD_SOURCE on the command line anyway. In this case, it's
better to keep the hack well-contained within this file.
Closes issue 886.
patch by Jorge Acereda, jacereda brainstorm es

Originally committed as revision 22164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 09:16:45 +00:00
Nash Tsai
d7a4961e53 vfwcap: support MJPG compressed streams. 
Patch by Nash Tsai <nash dot tsai at gmail dot com>

Originally committed as revision 22004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:49:16 +00:00
Ramiro Polla
802da0b490 Indent. 
Originally committed as revision 21933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 03:23:30 +00:00
Stefano Sabatini
1dc5c35809 Satisfy style nits. 
Originally committed as revision 21648 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-05 23:24:08 +00:00
Jai Menon
90d0379f5e Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field. 
Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-28 15:45:21 +00:00
kemuri
420755dd28 vfwcap: Include windows.h before vfw.h since the latter requires defines 
from the former.
Patch by kemuri <kemuri9 at gmail dot com>

Originally committed as revision 21411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 20:58:29 +00:00
Måns Rullgård
a482e61bd6 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
 2010-01-16 04:49:02 +00:00
Reinhard Tartler
8040c3b250 Define device_try_init() as static in libavdevice/v4l2.c. 
Patch by Reinhard Tartler (siretart AT tauware DOT de).

Originally committed as revision 21004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-03 10:43:36 +00:00
Carl Eugen Hoyos
3d1ebac8f7 Define _XOPEN_SOURCE as 600 before including a XSI extension header. 
Originally committed as revision 20871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 23:23:09 +00:00
Carl Eugen Hoyos
1f15747fc9 Use enum PixelFormat as type for input_pixfmt to avoid one icc warning. 
Originally committed as revision 20859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:52:32 +00:00
Luca Abeni
3db77ccf38 Support compressed formats in the V4L2 input device. 
Patch by klchxbec AT freenet DOT de.

Originally committed as revision 20858 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:34:31 +00:00
Luca Abeni
9eb6e9d9d3 Add support for V4L2 compressed formats in the table used for converting 
between V4L2 formats and ffmpeg's formats/codecs.
Patch by klchxbec AT freenet DOT de.

Originally committed as revision 20857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:33:24 +00:00
Luca Abeni
9202218e5d Use the correct type for the V4L2 format. 
Originally committed as revision 20856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:31:29 +00:00
Luca Abeni
158aa9f2db Return pkt->size in v4l2_read_packet(). 
mmap_read_frame() takes care of ensuring that the packet size
is correct.

Originally committed as revision 20855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:30:37 +00:00
Matthieu Castet
419bddd366 Include alsa headers before the internal FFmpeg headers. 
This avoids symbol redefinitions problems, for example avoids the "free"
symbol to be redefined before system headers actually using it are
included, thus breaking compilation. In particular this change allows
to build FFmpeg with salsa.

Patch by matthieu castet <$surname.mat?hieu@free fr>.

Originally committed as revision 20665 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 23:30:46 +00:00
Ivo van Poorten
244c8d100a consistency with other files: av_cold static ---> static av_cold 
Originally committed as revision 20662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 22:39:38 +00:00
Michael Niedermayer
f6dcc93705 Add nomouse option to not record the mouse cursor. 
Implements issue877

Originally committed as revision 20633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 19:36:18 +00:00
Michael Niedermayer
a5a61fac3b Remove unused stuff. 
Originally committed as revision 20632 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 18:56:30 +00:00
Roxis
781c1aa6dc Real cursor support in x11grab. 
Patch by Roxis /// roxis list dot ru
Slight changes by me to update the patch to current svn.

Originally committed as revision 20631 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 17:58:48 +00:00
Michael Niedermayer
d3298350bb Do not invent error codes but pass the error code on. 
Originally committed as revision 20630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 13:48:37 +00:00
Michael Niedermayer
fed0c2fb71 Replace very odd and completely broken oss read_packet() by the obvious way to 
read.
Fixes issue348.

Originally committed as revision 20629 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 13:37:53 +00:00
Diego Biurrun
c173693698 Add functions to return library license and library configuration. 
Originally committed as revision 20547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-18 17:15:17 +00:00
Diego Biurrun
d7a0e29f31 Split avdevice.c off from alldevices.c. 
alldevices.c is not a good place for avdevice_version().

Originally committed as revision 20546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-18 17:01:25 +00:00
Diego Biurrun
1f20782c04 Add missing #includes for avutil.h, required for the AV_VERSION* macros. 
Originally committed as revision 20544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-16 18:39:26 +00:00
Diego Biurrun
15674f12be cosmetics: Break overly long lines. 
Originally committed as revision 20276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 10:47:40 +00:00
Reimar Döffinger
58f873dded Fix compilation of beosaudio.cpp, not tested if it actually works though. 
Originally committed as revision 20098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 13:01:48 +00:00
Diego Biurrun
71e4218054 Fix METEOR vs. BKTR typo, noticed by Steve O'Hara-Smith, steve sohara org. 
Originally committed as revision 19965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 14:44:44 +00:00
Reimar Döffinger
31fe12a9fe Add missing strings.h include needed for strcasecmp. 
Originally committed as revision 19920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-19 09:09:07 +00:00
Vitor Sessak
600b9c5c8c Do not do free AVStream in case of error, this is not supposed to be 
done by the demuxer.

Fix issue 1378.

Originally committed as revision 19825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-12 16:23:13 +00:00
Ramiro Polla
315fa33f29 Indent. 
Originally committed as revision 19757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-04 16:32:06 +00:00
Ramiro Polla
a9decf0041 Use if(0){} instead of #if 0 to prevent debug code to rot. 
Originally committed as revision 19756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-04 16:31:21 +00:00
Måns Rullgård
95f2c769c3 Skip headers requiring external libs not present in checkheaders 
Originally committed as revision 19685 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-23 11:02:37 +00:00
Diego Biurrun
c959c6ee3d vfwcap: Move vfw_read_close to avoid forward declaration. 
Patch by Diego.

Originally committed as revision 19567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-02 17:39:10 +00:00
Ramiro Polla
155b0f00d4 vfwcap: Indent. 
Originally committed as revision 19545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 17:31:28 +00:00
Ramiro Polla
1c0b9215ac vfwcap: Support compressed streams. 
Originally committed as revision 19544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 17:29:24 +00:00
Ramiro Polla
42477de59e vfwcap: Reorder some code to simplify next patch. 
Originally committed as revision 19543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 17:25:15 +00:00
Ramiro Polla
d40b45e8b0 vfwcap: Return PIX_FMT_NONE instead of -1 on error. 
Originally committed as revision 19542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 16:18:33 +00:00
Ramiro Polla
189230ad67 vfwcap: Update error message: 
- Verbose debug information is at max -v 9 now;
- Add an empty space for readability.

Originally committed as revision 19541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 16:16:43 +00:00
Måns Rullgård
63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN 
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-26 12:20:04 +00:00
Måns Rullgård
62a0525d3b x11grab: remove unnecessary #includes and senseless #define 
Originally committed as revision 19479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-21 14:32:05 +00:00
Stefano Sabatini
38e54a75ab Make the configure script select the input/output devices using 
--enable-indev, --enable-outdev rather than --enable-demuxer,
--enable-muxer as before, same for disabling them.

Originally committed as revision 19293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-29 18:49:15 +00:00
Daniel Verkamp
cf6bae6883 Change codec_id type to enum CodecID, fix warning. 
Patch by Daniel Verkamp daniel @ drv @ nu.

Originally committed as revision 18768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-06 22:38:21 +00:00
Carl Eugen Hoyos
08982bb466 Cosmetics: Split long line. 
Originally committed as revision 18516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-14 22:33:46 +00:00
Carl Eugen Hoyos
899f38df62 Fix two icc warnings #188: enumerated type mixed with another type. 
Originally committed as revision 18515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-14 22:30:11 +00:00
Carl Eugen Hoyos
34bcada424 Fix icc warning #188: enumerated type mixed with another type. 
Originally committed as revision 18514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-14 22:21:53 +00:00
Carl Eugen Hoyos
5c463aacb2 Fix icc warning #188: enumerated type mixed with another type. 
Originally committed as revision 18513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-14 22:19:43 +00:00
Olivier Guilyardi
80ff8a16f5 Implement JACK input device. 
Patch by Olivier Guilyardi list samalyse com.
See the thread: "[FFmpeg-devel] [PATCH] libavdevice: JACK demuxer".

Originally committed as revision 18322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 23:53:47 +00:00
Luca Abeni
3cac2f1301 Fix AVFMT_FLAG_NONBLOCK in alsa 
Originally committed as revision 17863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-07 18:17:13 +00:00
Luca Abeni
1c787b1043 Cast a __u64 variable to uint64_t so that it can be printed without warnings 
Originally committed as revision 17325 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 14:32:09 +00:00
Diego Biurrun
b17e0f065c Remove file name from file headers. 
It provides no useful information and breaks on renames.

Originally committed as revision 17097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 11:17:54 +00:00
Diego Biurrun
f8a32581fa Add necessary #includes to pass 'make checkheaders'. 
Originally committed as revision 16933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 09:22:06 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Luca Abeni
5449a787c9 If AVPacket->data == NULL, the packet does not contain any buffer to 
be freed.
This fixes a double free on exit.

Originally committed as revision 16857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 12:41:44 +00:00
Nicolas George
35fd81224a Add ALSA support in libavdevice. 
Patch by Nicolas George: name surname normalesup org
Original thread: [FFmpeg-devel] [PATCH] ALSA for libavdevice
Date: 12/09/2008 07:17 PM

Originally committed as revision 16800 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 09:16:09 +00:00
Benoit Fouet
33054e35e3 Rename audio.c to oss_audio.c in libavdevice. 
Originally committed as revision 16707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-21 08:43:38 +00:00
Benoit Fouet
0c26e964e9 Use avf context in av_log, instead of NULL. 
Originally committed as revision 16695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 08:01:32 +00:00
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