f9569249c2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Remove some unused scripts from tools/.
Add x86 assembly for some 10-bit H.264 intra predict functions.
v4l2: do not force NTSC as standard
Skip tableprint.h during 'make checkheaders'.
Remove unnecessary LIBAVFORMAT_BUILD #ifdef.
Drop explicit filenames from @file Doxygen tags.
Skip generated table headers during 'make checkheaders'.
lavf,lavc: free avoptions in a generic way.
AVOptions: add av_opt_free convenience function.
tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS.
tiff: print log in case of unknown / unsupported tag.
tiff: fix linesize for mono-white/black formats.
Fix build of eval-test program
configure: Document --enable-vaapi
ac3enc: extract all exponents for the frame at once
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-06 03:33:58 +02:00
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
99eb31e263
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (25 commits)
Replace custom DEBUG preprocessor trickery by the standard one.
vorbis: Remove non-compiling debug statement.
vorbis: Remove pointless DEBUG #ifdef around debug output macros.
cook: Remove non-compiling debug output.
Remove pointless #ifdefs around function declarations in a header.
Replace #ifdef + av_log() combinations by av_dlog().
Replace custom debug output functions by av_dlog().
cook: Remove unused debug functions.
Remove stray extra arguments from av_dlog() invocations.
targa: fix big-endian build
v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
vfwcap: add a framerate private option.
v4l2: add a framerate private option.
libdc1394: add a framerate private option.
fbdev: add a framerate private option.
bktr: add a framerate private option.
oma: check avio_read() return value
nutdec: remove unused variable
Remove unused variables
swscale: allocate larger buffer to handle altivec overreads.
...
Conflicts:
ffmpeg.c
libavcodec/dca.c
libavcodec/dirac.c
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pthread.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/shorten.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavdevice/dv1394.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/4xm.c
libavformat/apetag.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/mmf.c
libavformat/mpeg.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/oggdec.c
libavformat/oggparseogm.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/rtpdec_latm.c
libavformat/sauce.c
libavformat/sol.c
libswscale/utils.c
tests/ref/vsynth1/error
tests/ref/vsynth2/error
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-03 05:19:30 +02:00
f190f676bc
Replace custom DEBUG preprocessor trickery by the standard one.
2011-06-03 00:44:06 +02:00
4078ed2631
vfwcap: add a framerate private option.
2011-06-02 21:52:15 +02:00
8381ab1437
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (29 commits)
ARM: disable ff_vector_fmul_vfp on VFPv3 systems
ARM: check for VFPv3
swscale: Remove unused variables in x86 code.
doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS.
x86: Add appropriate ifdefs around certain AVX functions.
cmdutils: use sws_freeContext() instead of av_freep().
swscale: delay allocation of formatConvBuffer().
swscale: fix build with --disable-swscale-alpha.
movenc: Deprecate the global RTP hinting flag, use a private AVOption instead
movenc: Add an AVClass for setting muxer specific options
swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
configure: report yasm/nasm presence properly
tcp: make connect() timeout properly
rawdec: factor video demuxer definitions into a macro.
rtspdec: add initial_pause private option.
lavf: deprecate AVFormatParameters.width/height.
tty: add video_size private option.
rawdec: add video_size private option.
x11grab: add video_size private option.
x11grab: factorize returning error codes.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-05-27 23:48:22 +02:00
6b899e16de
lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h
2011-05-27 12:15:09 +02:00
3e15ea2150
vfwcap: add video_size private option.
2011-05-27 06:52:51 +02:00
95eb2e3a38
DirectShow capture support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-05-21 17:23:14 +02:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-03-19 13:33:20 +00:00
66355be3c3
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.
(cherry picked from commit c6610a216e
2011-01-28 03:15:34 +01:00
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
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
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
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
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
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
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
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
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
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
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
315fa33f29
Indent.
...
Originally committed as revision 19757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-04 16:32:06 +00:00
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
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
155b0f00d4
vfwcap: Indent.
...
Originally committed as revision 19545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 17:31:28 +00:00
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
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
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
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
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
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
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
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
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
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
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
4b1131a075
typo
...
Originally committed as revision 12823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 16:20:58 +00:00
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
23ef6da836
Support biCompression I420
...
Originally committed as revision 12821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 15:41:10 +00:00
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
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
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
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
c234520736
VFW capture support
...
Originally committed as revision 12384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 22:10:28 +00:00
