virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
24,293 Commits 37 Branches 400 Tags 467 MiB
dd798dcd11
Commit Graph

164 Commits

Author SHA1 Message Date
Stefano Sabatini
50f852186f Make device_open() store the VIDIOC_QUERYCAP ioctl errno, and in case 
of failure return the stored value rather than the current errno,
which may be overwritten by a following call to close().

Originally committed as revision 23001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 08:24:24 +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
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
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
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
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