ec4207c46a
swscale: factor should_dither out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-05 04:24:45 +02:00
46eb300d01
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ARM: remove MULL inline asm
mathops: use MUL64 macro where it forms part of other ops
tty: factorise returning error codes.
rawdec: add framerate private option.
x11grab: add framerate private option.
fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
bktr: don't error when AVFormatParameters.time_base isn't set.
cmdutils: add missing const qualifier
Skip headers not designed to work standalone during 'make checkheaders'.
Add missing #includes to make headers self-contained.
musepack: remove unnecessary #include from mpcdata.h
musepack: remove extraneous mpcdata.h inclusions
Fix error check in av_file_map()
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-05 03:00:31 +02:00
594fbe42c6
ARM: remove MULL inline asm
...
Reasonable gcc versions get this one right on their own.
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-04 21:33:23 +01:00
95912731c2
mathops: use MUL64 macro where it forms part of other ops
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-04 20:10:20 +01:00
8346f60afb
tty: factorise returning error codes.
2011-06-04 19:53:45 +02:00
e762b1ce95
rawdec: add framerate private option.
2011-06-04 19:51:43 +02:00
ff494cbdaf
x11grab: add framerate private option.
2011-06-04 19:49:56 +02:00
a3b15e411d
fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
2011-06-04 19:48:08 +02:00
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
42abb9a80d
cmdutils: add missing const qualifier
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-04 18:09:01 +01:00
61ec024d39
Skip headers not designed to work standalone during 'make checkheaders'.
2011-06-04 18:16:38 +02:00
8d459acc10
Add missing #includes to make headers self-contained.
...
This fixes 'make checkheaders'.
2011-06-04 18:15:50 +02:00
67ace7f047
musepack: remove unnecessary #include from mpcdata.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-04 17:03:59 +01:00
91b4941c17
musepack: remove extraneous mpcdata.h inclusions
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-04 17:03:59 +01:00
d0989bed22
Fix error check in av_file_map()
...
On failure, mmap() returns MAP_FAILED, which may or may not be -1.
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-04 17:03:25 +01:00
124a9edb5f
udp: support old, crappy non pthread mode
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-04 16:55:22 +02:00
87f40364d1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (21 commits)
build: simplify commands for clean target
swscale: split swscale.c in unscaled and generic conversion routines.
swscale: cosmetics.
swscale: integrate (literally) swscale_template.c in swscale.c.
swscale: split out x86/swscale_template.c from swscale.c.
swscale: enable hScale_altivec_real.
swscale: split out ppc _template.c files from main swscale.c.
swscale: remove indirections in ppc/swscale_template.c.
swscale: split out unscaled altivec YUV converters in their own file.
mpegvideoenc: fix multislice fate tests with threading disabled.
mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
build: Simplify texi2html invocation through the --output option.
Mark some variables with av_unused
Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().
svq3: Check negative mb_type to fix potential crash.
svq3: Move svq3-specific fields to their own context.
rawdec: initialize return value to 0.
Remove unused get_psnr() prototype
rawdec: don't leak option strings.
bktr: get default framerate from video standard.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-04 06:35:17 +02:00
e4e2db9c74
ffmpeg: use opt_acodec when setting audio codec in opt_target.
2011-06-03 19:52:59 -07:00
bfd3b70ac3
ffmpeg: fix segfault with too many output files
...
Fixes Ticket219
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-04 01:24:00 +02:00
33af5335fd
ffplay: error out with invalid sample rate or channels.
...
Fixes Ticket119
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-04 00:16:12 +02:00
49125aeddc
oggdec: fix Ticket185
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-03 21:14:30 +02:00
dc6632f119
build: simplify commands for clean target
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-03 19:33:32 +01:00
c1daf0723c
j2kdec: dont fail on non zero cblock style.
...
This allows decoding to continue a bit further for some files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-03 19:41:15 +02:00
58149303b3
makefile: fix j2k encoder dependancies
2011-06-03 19:41:15 +02:00
f35761bca2
udp: fix indention
2011-06-03 19:41:15 +02:00
6af2801088
swscale: split swscale.c in unscaled and generic conversion routines.
...
This duplicates the function fillPlane().
2011-06-03 09:52:09 -07:00
2762ee3034
swscale: cosmetics.
...
Remove duplicate "inC" and "_c" functions that do the same thing;
give each function that handles data and acts as a function pointer
a "_c" suffix; remove "_c" suffix from functions that are inherently
not optimizable. Remove inline keyword from functions that are only
used through function pointers.
2011-06-03 09:52:09 -07:00
1674bd2abe
swscale: integrate (literally) swscale_template.c in swscale.c.
2011-06-03 09:52:09 -07:00
983260b0a4
swscale: split out x86/swscale_template.c from swscale.c.
2011-06-03 09:52:09 -07:00
075d0ae72c
swscale: enable hScale_altivec_real.
2011-06-03 09:52:09 -07:00
67d80a5421
swscale: split out ppc _template.c files from main swscale.c.
2011-06-03 09:52:09 -07:00
a3e9bb5dee
swscale: remove indirections in ppc/swscale_template.c.
2011-06-03 09:52:09 -07:00
0e5d31b16b
swscale: split out unscaled altivec YUV converters in their own file.
2011-06-03 09:52:09 -07:00
83a8b3002f
mpegvideoenc: fix multislice fate tests with threading disabled.
...
The MPEG encoding code assumes that n_threads == n_slices, and thus it
should use n_slices even if threading itself is disabled.
2011-06-03 09:52:09 -07:00
25c32d082b
cmdutils: move "#undef main" from ffplay.c to cmdutils.h
...
On Windows/MinGW the SDL cflags re-define the main() function, which
results in a linking error if the define is not undeffed.
Since the addition of the SDL output device, SDL cflags are used also
for compiling ffmpeg and ffprobe, so we need to move this trick from
ffplay.c to a common header.
Fix trac issue #256 .
2011-06-03 17:03:43 +02:00
c9614bb22c
wav: update size check for ds64
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-03 15:48:08 +02:00
e472f0ea5a
wav: fix skip size at end of ds64 chunk
2011-06-03 15:48:08 +02:00
43b6c3eb18
mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
2011-06-03 15:43:34 +02:00
a5514a8474
build: Simplify texi2html invocation through the --output option.
...
The --output option is available in texi2html since at least version 1.78.
2011-06-03 15:43:05 +02:00
5e1166b31b
Mark some variables with av_unused
...
Most of these variables are only used in av_dlog statements, some
are required but not used by other macros.
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-03 12:59:05 +01:00
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
93d06bd1df
svq3: Check negative mb_type to fix potential crash.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2011-06-03 13:55:55 +02:00
8dfc6d1f7c
svq3: Move svq3-specific fields to their own context.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2011-06-03 13:55:54 +02:00
1f94c31f69
rawdec: initialize return value to 0.
2011-06-03 13:51:43 +02:00
c1dfb72d35
Remove unused get_psnr() prototype
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-06-03 11:49:32 +01:00
a606aa7570
rawdec: don't leak option strings.
2011-06-03 08:11:17 +02:00
bd7c1d35a6
bktr: get default framerate from video standard.
2011-06-03 08:11:05 +02:00
0d793db1b0
swscale: remove unused COMPILE_TEMPLATE_ALTIVEC.
2011-06-02 21:29:59 -07: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
9034001b17
h264 fill_filter_caches: Dont init chroma nnz_cache.
...
Found-by: Dark Shikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-03 03:46:13 +02:00
