Commit Graph

139 Commits

Author SHA1 Message Date
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