generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
39,030 Commits 24 Branches 241 Tags 173 MiB
0d6605c7ef
Commit Graph

345 Commits

Author SHA1 Message Date
Stefano Sabatini
a5351720cc fbdev: prefer "framerate_q" over "fps" in device context 
The variable is used for containing the parsed value of framerate,
using a lexically consistent name eases readability/understanding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-23 08:49:49 +02:00
Stefano Sabatini
da51a7c69c bktr: prefer "framerate" over "fps" for grab_read_header() 
The variable is used for containing the parsed value of s1->framerate,
using a lexically consistent name ease readability/understanding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-23 08:49:48 +02:00
Nicolas George
147bcf27c4 ALSA: implement channel layout for playback. 
Currently quad, 5.0, 5.1 and 7.1 are implemented.
Implementing support for other formats/layouts and capture should be
straightforward.

5.0 and 7.1 support by Carl Eugen Hoyos.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-23 08:49:48 +02:00
Carl Eugen Hoyos
2359aeb52d alsa: support unsigned variants of already supported signed formats. 2011-06-23 08:49:48 +02:00
Carl Eugen Hoyos
921715edff alsa: add support for more formats. 
Specifically, f32, f64, s32, s24, a-law and mu-law.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-23 08:49:48 +02:00
Sven C. Dack
2f2c60400a x11grab: remove a memory allocation and the associated memcpy. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-12 12:18:05 +02:00
Reimar Döffinger
c673c90515 oss,sndio: simplify by using FFMIN. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-09 22:53:17 +02:00
Luca Barbato
2c6fb9f032 v4l2: do not force NTSC as standard 
Setting a standard is meaningful only for analog capture devices.
 2011-06-05 14:20:56 -05:00
Anton Khirnov
367732832f lavf,lavc: free avoptions in a generic way. 
It's simpler and less error-prone.

Fixes some memleaks along the way.
 2011-06-05 15:01:36 +02:00
Anton Khirnov
ff494cbdaf x11grab: add framerate private option. 2011-06-04 19:49:56 +02:00
Anton Khirnov
a3b15e411d fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base. 2011-06-04 19:48:08 +02:00
Anton Khirnov
1572484f62 bktr: don't error when AVFormatParameters.time_base isn't set. 
There's a private option for it now.
 2011-06-04 19:47:59 +02:00
Stefano Sabatini
94bed8e582 Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). 
This fixes warnings about avcodec_get_pix_fmt_name() being deprecated.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-03 13:55:55 +02:00
Anton Khirnov
bd7c1d35a6 bktr: get default framerate from video standard. 2011-06-03 08:11:05 +02:00
Diego Biurrun
f190f676bc Replace custom DEBUG preprocessor trickery by the standard one. 2011-06-03 00:44:06 +02:00
Diego Biurrun
2366462429 Replace #ifdef + av_log() combinations by av_dlog(). 2011-06-03 00:44:03 +02:00
Anton Khirnov
fefa67d536 v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. 2011-06-02 21:52:15 +02:00
Anton Khirnov
4078ed2631 vfwcap: add a framerate private option. 2011-06-02 21:52:15 +02:00
Anton Khirnov
c21324eeb6 v4l2: add a framerate private option. 2011-06-02 21:52:15 +02:00
Anton Khirnov
121ef2e26d libdc1394: add a framerate private option. 2011-06-02 21:52:15 +02:00
Anton Khirnov
1556186a62 fbdev: add a framerate private option. 2011-06-02 21:52:12 +02:00
Anton Khirnov
3e3db4d93d bktr: add a framerate private option. 2011-06-02 21:50:17 +02:00
Anton Khirnov
7a70e01b26 v4l2: don't leak video standard string on error. 2011-05-29 15:10:35 +02:00
Anton Khirnov
d576bbf3eb v4l2: add a pixel_format private option. 2011-05-27 23:33:51 +02:00
Anton Khirnov
2e0e1e712a libdc1394: add a pixel_format private option. 2011-05-27 23:33:51 +02:00
Anton Khirnov
724a900c45 x11grab: add video_size private option. 2011-05-27 06:52:52 +02:00
Anton Khirnov
3102fb0351 x11grab: factorize returning error codes. 2011-05-27 06:52:52 +02:00
Anton Khirnov
3e15ea2150 vfwcap: add video_size private option. 2011-05-27 06:52:51 +02:00
Anton Khirnov
8fe7b6443f v4l2: add video_size private option. 2011-05-27 06:52:51 +02:00
Anton Khirnov
82b5aa0add v4l2: factorize returning error codes. 
This will be useful in the following commit.
 2011-05-27 06:52:51 +02:00
Anton Khirnov
fd48620e3e libdc1394: add video_size private option. 2011-05-27 06:52:51 +02:00
Anton Khirnov
284bac2e77 libdc1394: return meaninful error codes. 2011-05-27 06:52:51 +02:00
Anton Khirnov
33e0369672 bktr: add video_size private option. 2011-05-27 06:52:51 +02:00
Anton Khirnov
3577416212 bktr: factorize returning error codes. 
This will be useful in the following commit.
 2011-05-27 06:52:51 +02:00
Anton Khirnov
3d96c13e43 v4l: include avdevice.h 
Fixes build.
 2011-05-26 20:44:19 +02:00
Anton Khirnov
aaea149035 lavdevice: mark v4l for removal on next major bump. 2011-05-26 19:04:02 +02:00
Anton Khirnov
2341c97e8d libdc1394: fix compilation. 
Add a forgotten comma and move options/class definition outside of
HAVE_LIBDC1394_1.
 2011-05-26 09:23:56 +02:00
Anton Khirnov
d20576d01b lavf: deprecate AVFormatParameters.channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
79405e57dc libdc1394: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
986f4f4918 dv1394: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
3d2a418605 v4l2: reindent. 2011-05-25 15:55:47 +02:00
Anton Khirnov
a02fd06ab7 v4l2: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
fc68a8f703 lavf: deprecate AVFormatParameters.standard. 2011-05-25 15:55:47 +02:00
Anton Khirnov
b3da269211 v4l2: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov
a861ffeffa v4l: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov
eb040dbbd3 dv1394: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov
e199eb44fd bktr: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov
bffd4dd1d3 lavf: deprecate AVFormatParameters.{channels,sample_rate}. 2011-05-25 15:55:46 +02:00
Anton Khirnov
2ea8faf39f ALSA: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Anton Khirnov
003e63b6df oss: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Anton Khirnov
a1a15a9993 sndio: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Diego Biurrun
046f081b46 configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS. 
Adding _POSIX_C_SOURCE to CPPFLAGS globally produces all sorts of problems
since it causes certain system functions to be hidden on some (BSD) systems.
The solution is to only add the flag on systems that really require it, i.e.
glibc-based ones.

This change makes BSD systems compile out-of-the-box without the need for
adding specific flags manually.  It also allows dropping a number of flags
set manually on a file-per-file basis, but were only present to work around
breakage introduced by the presence of _POSIX_C_SOURCE.

Also add _XOPEN_SOURCE to CPPFLAGS for glibc systems.  We use XSI extensions
in several places already, so it is preferable to define it globally instead
of littering source files with individual #defines only needed for glibc.
 2011-05-12 11:41:59 +02:00
Diego Biurrun
045dd4b928 Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-04-29 17:27:01 +02:00
Martin Storsjö
32a128522a libavdevice: Define _XOPEN_SOURCE for usleep 
This hopefully fixes build failures on Dragonfly BSD.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-04-21 14:13:09 +03:00
Anton Khirnov
139f3ac42d Bump major versions of all libraries. 
They've accumulated enough new APIs and corresponding deprecated cruft.

This breaks API and ABI.
 2011-04-18 20:19:47 +02:00
Brad
2eddfb2b13 sndio bug fix 
Since the code already supports both little- and big-endian
audio for recording, do not fail just because the endianness is not
what we expect.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-29 21:19:39 -07:00
Stefano Sabatini
c6f951442e framebuffer device demuxer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-28 16:49:22 +02:00
Brad
15d59d2cea sndio support for playback and record 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-27 10:46:45 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Janne Grunau
a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Janne Grunau
29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION 
also update the multiple inclusion guards in config.h|mak
 2011-03-16 21:54:39 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Janne Grunau
2c3589bfda consolidate .gitignore patters into a single file 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-18 21:32:05 +01:00
Janne Grunau
348b8218f7 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-17 15:50:14 +01:00
Stefano Sabatini
5d3d238f82 Factorize common code in v4l2_set_parameters(). 
Originally committed as revision 26225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 14:15:13 +00:00
Stefano Sabatini
8621a37d9f In video4linux2, in the case the timebase value in ap is 0/0, read the 
timebase value already set in the driver, and set it back in the codec
stream, rather than leaving the invalid value of 0/0.

In particular, fix ffmpeg grabbing timestamps when the timebase value
is not set through the CLI.

Originally committed as revision 26224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 14:15:11 +00:00
Stefano Sabatini
bd7d9e45a4 In the video4linux2 output device, log an error description in case of 
ioctl failure in mmap_release_buffer().

Originally committed as revision 26214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 18:18:01 +00:00
Jason Garrett-Glaser
8ce803db51 Make x11grab cursor drawing suck less 
This new version:
1.  Works on 24-bit and 32-bit input, not just 32-bit.
2.  Doesn't try to run on 16-bit or 8-bit, instead of outright crashing.
3.  Does proper alpha-blending, so cursor shadows look correct.
4.  Doesn't swap R and B.

Mostly fixes issue 1997.
Fixes issue 2056.

Originally committed as revision 25690 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-07 18:04:46 +00:00
Ramiro Polla
1973e1018e vfwcap: add option to print list of supported drivers 
Originally committed as revision 25552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 02:11:30 +00:00
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
Stefano Sabatini
0105889358 Cosmetics: simplify layout of fmt_conversion_table, make it shorter 
and more readable.

Originally committed as revision 25108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-12 19:44:45 +00:00
Stefano Sabatini
680861ca73 Cosmetics: apply minor style fixes. 
Originally committed as revision 25106 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-11 16:44:10 +00:00
Stefano Sabatini
e16f217ceb Use new imgutils.h API names, fix deprecation warnings. 
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 19:15:29 +00:00
Stefano Sabatini
4f2d2e4ed9 Define macro AV_NE() and use it in libavdevice. 
Help further refactoring.

Originally committed as revision 24814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 18:25:34 +00:00
Pete Eberlein
b4f81b7429 Add a mapping for the V4L2_PIX_FMT_NV12 format to PIX_FMT_NV12 for 
video4linux2 devices. This is used by Sensoray Model 2253 cards.
Patch by Pete Eberlein (pete AT sensoray DOT com)

Originally committed as revision 24759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 07:34:33 +00:00
Stefano Sabatini
6ce9b4310c Remove use of the deprecated function avcodec_check_dimensions(), use 
av_check_image_size() instead.

Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 09:37:04 +00:00
Diego Biurrun
09f6a45dc2 Remove non-existing stray arguments from Doxygen function documentation. 
Originally committed as revision 23976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 11:19:29 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +00:00
Carl Eugen Hoyos
33e7febdbe Remove stray semicolon. 
Originally committed as revision 23691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-21 22:54:53 +00:00
Diego Biurrun
c1b85795cb Remove broken BeOS audio interface. 
Originally committed as revision 23568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 17:23:45 +00:00
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
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