Carl Eugen Hoyos
8e082df0f4
Support decoding of monochrome tiff images without bpp tag.
2012-09-12 13:33:57 +02:00
Michael Niedermayer
ac0f1ae64b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
utvideoenc: Add missing AV_ prefix to codec ID
avserver: Add missing #include for av_gettime()
configure: Only disable aligned stack on MSVC on 32 bit
configure: indentation cosmetics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-12 11:46:47 +02:00
Derek Buitenhuis
578bbf8149
diracdsp: Fix unprotected inline asm
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 22:59:43 +02:00
Michael Niedermayer
0ea65bbeee
ratecontrol: change a commented printf to av_log
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 17:50:14 +02:00
Michael Niedermayer
50dba71b7d
ratecontrol: fix get_fps() argument
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 17:50:14 +02:00
Michael Niedermayer
ce7876cbf4
ratecontrol: Dynamically choose a default for rc_max_available_vbv_use
...
This improves handling of small buffer sizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 17:50:14 +02:00
Michael Niedermayer
a990a30883
ratecontrol: correct predictor in case of stuffing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 17:50:14 +02:00
Diego Biurrun
76fa7e09f1
utvideoenc: Add missing AV_ prefix to codec ID
2012-09-11 17:40:38 +02:00
Diego Biurrun
1648a508fa
x86: dsputil: Move specific optimization settings out of global init function
...
They belong in the init functions specific to each CPU capability.
2012-09-11 10:12:17 +02:00
Michael Niedermayer
ba9e9605ad
cavsdec/decode_mb_b: fix return type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 07:13:49 +02:00
Michael Niedermayer
386d60f978
aacdec/lcg_random: fix harmless integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 03:02:51 +02:00
Michael Niedermayer
7ea5dbcb83
cavsdec: Fix assertion failure.
...
The assert in decode_mb_b() is replaced by a normal error check for the
case that can occur with a damaged or crafted bitstream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 03:02:51 +02:00
Stefano Sabatini
7b62d3415e
lavc/h263dec: return or propagate proper error codes
2012-09-11 01:15:10 +02:00
Stefano Sabatini
ac006d29d8
lavc/flvdec: return meaningful error codes
2012-09-11 01:15:10 +02:00
Michael Niedermayer
76fac07334
mpegaudiodec: replace pow(2.0,...) by exp2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 22:34:18 +02:00
Michael Niedermayer
c5f0b6bf41
atrac3: replace powf(2,...) by exp2f()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 22:32:56 +02:00
Michael Niedermayer
17b3251c6c
ra144enc: avoid integer overflows.
...
The values are all positive but signed variables where used,
which overflowed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 21:04:01 +02:00
Sébastien Brochet
e14725cecc
add OTF support for attachments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 17:08:18 +02:00
Ben Jackson
616ef2e8bd
lavc/pngenc: Enable frame threading for PNG encodes
...
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 15:15:40 +02:00
Michael Niedermayer
bff2afb3e9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: Only compile motion_est code when encoders are enabled
mem: fix typo in check for __ICC
fate: mp3: drop redundant CMP setting
rtp: Depacketization of JPEG (RFC 2435)
Rename ff_put_string to avpriv_put_string
mjpeg: Rename some symbols to avpriv_* instead of ff_*
yadif: cosmetics
Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 14:06:20 +02:00
Diego Biurrun
a84edbacaf
x86: dsputil: Only compile motion_est code when encoders are enabled
2012-09-10 08:31:47 +02:00
Reinhard Nissl
2474ca1a22
aacdec.c: fix some comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 22:54:10 +02:00
Samuel Pitoiset
3c19815416
rtp: Depacketization of JPEG (RFC 2435)
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-09 22:22:21 +03:00
Martin Storsjö
aefea4d0de
Rename ff_put_string to avpriv_put_string
...
This allows using it from libavformat as well. This will be used
by the RTP/JPEG depacketizer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-09 22:22:12 +03:00
Samuel Pitoiset
a0845bae49
mjpeg: Rename some symbols to avpriv_* instead of ff_*
...
These symbols will be used from the RTP/JPEG depacketizer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-09 22:22:07 +03:00
Michael Niedermayer
44f83930d9
x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx
...
this is a regression since today
Found-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 18:39:03 +02:00
Derek Buitenhuis
3629d1c09d
dsputil_template: Reindent after recent change
...
Forgot to keep it pretty in e62e455f7b
.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 17:21:37 +02:00
Michael Niedermayer
6add8eb2ce
x86/h264dsp_init: put a HAVE_YASM back
...
Should fix compilation on open solaris
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 17:21:02 +02:00
Michael Niedermayer
17f9626b5d
tiff/doubles2str: check for truncation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 14:41:18 +02:00
Michael Niedermayer
0196bc6f14
tiff/doubles2str: factor out component_len
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 14:40:10 +02:00
Michael Niedermayer
b9a07e787b
srtdec: fix unsafe snprintf() return usage
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 14:19:02 +02:00
Michael Niedermayer
9fea619f19
ass: assert that the timsstamps fitted in the buffers
...
Failure of the assert would cause various problems later
if we continue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 14:19:02 +02:00
Michael Niedermayer
77aedc77ab
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
swscale: Provide the right alignment for external mmx asm
x86: Replace checks for CPU extensions and flags by convenience macros
configure: msvc: fix/simplify setting of flags for hostcc
x86: mlpdsp: mlp_filter_channel_x86 requires inline asm
Conflicts:
libavcodec/x86/fft_init.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/proresdsp_init.c
libavutil/x86/float_dsp_init.c
libswscale/utils.c
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 13:27:42 +02:00
Michael Niedermayer
4819d43d7f
aacpsy: use exp2(f) instead of pow(f)(2,...)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 13:02:08 +02:00
Michael Niedermayer
363d302ea3
imc: use exp2 instead of pow(2,...)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 13:02:08 +02:00
Derek Buitenhuis
e62e455f7b
dsputil/me/pixels: Actually use av_restrict
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 03:55:56 +02:00
Michael Niedermayer
d48ebfbdea
mpeg4videodec: Fix "warning: dc_pred_dir may be used uninitialized in this function"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09 03:15:46 +02:00
Michael Niedermayer
dd081f98dd
dct-test: fix order of evaluation bug
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08 23:57:37 +02:00
Diego Biurrun
e0c6cce447
x86: Replace checks for CPU extensions and flags by convenience macros
...
This separates code relying on inline from that relying on external
assembly and fixes instances where the coalesced check was incorrect.
2012-09-08 18:18:34 +02:00
Hendrik Leppkes
fb4e983e0c
x86: mlpdsp: mlp_filter_channel_x86 requires inline asm
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-08 15:41:44 +03:00
Michael Niedermayer
7beadfe1f7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mov_chan: Only set the channel_layout if setting it to a nonzero value
mov_chan: Reindent an incorrectly indented line
mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
x86: more specific checks for availability of required assembly capabilities
x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
fate: Drop redundant setting of FUZZ to 1
cavsdsp: set idct permutation independently of dsputil
x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08 12:53:44 +02:00
Daniel Verkamp
124f0b2f46
flashsv2enc: only encode diff blocks when needed
...
A flashsv2 block may have a "diff block" to indicate which scan lines of
the block are actually encoded. However, this diff block need not be
used when the entire block is coded.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08 05:36:34 +02:00
Michael Niedermayer
097c64ffcb
flashsv2enc: remove experimental flag, the encoder seems working now
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 22:53:21 +02:00
Michael Niedermayer
dbb9117d18
flashsv2enc: move blockbuffer realloc to reconfigure_at_keyframe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 21:46:34 +02:00
Michael Niedermayer
9b6467fd46
flashv2enc: reallocate not only on block count changes but on dimension changes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 21:46:34 +02:00
Derek Buitenhuis
3174987b42
flashsv2enc: Replace a VLA with a heap alloc
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 21:46:34 +02:00
Michael Niedermayer
9b326fc261
flashsv2enc: fix prev-Z-prime encoding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 21:46:34 +02:00
Michael Niedermayer
8e6511c1e1
proresdec2: avoid VLA and use SliceContext instead.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 19:38:23 +02:00
Diego Biurrun
1169f0d0af
x86: more specific checks for availability of required assembly capabilities
2012-09-07 18:16:04 +02:00
Diego Biurrun
8cb7ed5562
x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
2012-09-07 13:50:52 +02:00