Michael Niedermayer
443261cbbd
Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'
...
* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432':
drawtext: Add fontconfig support
Conflicts:
configure
doc/filters.texi
libavfilter/vf_drawtext.c
See: 40b7a27bad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
f1b239ec8b
drawtext: Add fontconfig support
...
Introduce the `font` option and make it optional to pass a fontfile.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Anh
c150e2cf32
Fix compilation with --disable-everything --enable-muxer=avi --disable-network.
...
Fixes ticket #3568 .
11 years ago
Michael Niedermayer
58a53123ba
avcodec/vble: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7999b41d48
avfilter/vf_pixdesctest: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
dd77f6469a
avformat/ico: use avmalloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
11b36b1ee0
x86/float_dsp: unroll loop in vector_fmac_scalar
...
~6% faster SSE2 performance. AVX/FMA3 are unaffected.
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Matt Oliver
27f184ef40
Fix OpenGL device compilation with msvc gl.h
...
Reveiwed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
572f5eb1af
avformat/mpegenc: try to improve the VBV buffer warning
...
Maybe fixes Ticket 3494
Part of the message suggested by: rogerdpack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
3b808900af
x86/float_dsp: use SWAP in vector_fmac_scalar Win64
...
The mova is unnecessary
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cb53beb81a
iavcodec/vc1dec: Fix missing {}
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
73734282e0
avfilter/vf_deshake: fix loss of precission with odd resolutions
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5a8ef3c66b
avfilter/f_select: fix loss of precission in SAD calculation
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1457f3fd90
avcodec/g723_1: add assert to help static code analyzers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b8598f6ce6
avcodec/diracdec: fix undefined behavior with shifts
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ff6fa0b4b9
avformat/mpegts: Remove redundant check
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
230db1426d
avcodec/fic: Fix return value check
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f202af29c9
avcodec/dcadec: fix error message suppression code
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
256f530603
avcodec/mjpegen: Fix declared argument size
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
14fa7fc6a8
swscale/swscale: fix srcStride/srcSlice typo
...
Fixes part of Ticket3466
Found by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
79d82a6574
avformat/hnm: fix decoding of 256x256 video
...
Fixes Ticket3464
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bdc812ab9e
avformat/flacdec/flac_read_timestamp: free the correct packet
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6d8ccc7ac7
avformat/flacdec/flac_read_timestamp: dont modify AVStream state
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Peter Ross
5f4f9ee99f
Direct Stream Digital (DSD) decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lars Hammarstrand
add5d7a8ce
configure: allow the gas-preprocessor to be called with an absolute path.
...
Allow the configure tool to call the gas-preprocessor with an absolute
path when included with either the "--as" or with a separate "--gas"
option. The patch is backward compatible and will not break any current
configuration setups.
The new behavior that comes with this option can be utilized in the
following ways:
Examples:
- Just as single option that includes both the gas-preprocessor.pl and
cc/as at the same time:
$ configure --as="/opt/app/build-tools/gas-preprocessor.pl \
/Applications/Xcode.app/.../Developer/usr/bin/gcc"
- Call gas-preprocessor with a separate option in conjunction with --as:
$ configure --gas="/opt/app/build-tools/gas-preprocessor.pl" \
--as="/Applications/Xcode.app/.../Developer/usr/bin/gcc"
- Address only the the gas-preprocessor and it will automatically fall
back to as or cc whichever that's defined:
$ configure --gas="/opt/app/build-tools/gas-preprocessor.pl"
- Or if no gas-preprocessor.pl is explicitly defined, it falls back to
the old behaivor.
11 years ago
Michael Niedermayer
37f3f32d51
fate: force 128kb/sec for mp2 test
...
This fixes rounding differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c6902f96d7
avcodec/mpegaudioenc_template: Fix integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4615ff0d61
avutil/frame: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
eead2cddb7
avformat/xmv: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
337f74868c
avformat/mpegtsenc: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
083b6e739b
avformat/utils: fix typo
...
Found-by: reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2b58c9c945
swresample/resample_template: try to consider src_size more exactly
...
This should avoid slight differences in the output causes by input
size alignment differences between archs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0bf25c7b08
configure: fix arm osx build
...
Fixes Ticket3561
Solution suggested by jeremyhu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ef818d8bf0
avformat: add av_format_inject_global_side_data(), and disable it by default
...
After this commit applications needs to call av_format_inject_global_side_data()
or handle AVStream side data by some other means if they want it not to be lost.
This fixes a API incompatibility with libav.
libav API does not allow the data to be passed through AVPackets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2adcd15f2e
Merge commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62'
...
* commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62':
vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4959a4fcf7
swscale/utils: fix changing src/dst range after initializing the context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fa98885be4
swscale/utils: move handling of unscaled case to the end of init function
...
This way all context fields get initialized and can be used without needing to reinit the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a2f088c0f9
swscale: factor ff_sws_init_range_convert() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3751e5a821
swscale/swscale: clear to/from convert pointers when they used.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b465aaa59f
avformat/img2dec: fix typo
...
Found-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Martin Storsjö
a6ac4fcce4
vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock
...
This array is written using AV_WN32A, assuming alignment.
This hopefully fixes the failing vp7 fate test on sparc.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Michael Niedermayer
3df787a1ef
Merge branch 'flac' of https://github.com/FernetMenta/FFmpeg
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
46d5625f44
avcodec/x86/idct_sse2_xvid: fix non C99 inline function
...
Found-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Rainer Hochecker
d8b19ee672
fate: update seeking reference for flac
11 years ago
Rainer Hochecker
e1fcd3a007
flac demuxer: improve seeking
11 years ago
Carl Eugen Hoyos
ef48ac6523
Set the bitrate when decoding speex.
...
The bitrate of the first frame is used as bitrate for the speex stream.
11 years ago
Carl Eugen Hoyos
63c03ea98d
Fix writing RGB 5:5:5 rawvideo into avi.
...
WMP expects bits per pixel to be set to 16 for RGB 5:5:5 rawvideo.
11 years ago
Michael Niedermayer
9468e9e5a2
Merge commit 'b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7'
...
* commit 'b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7':
dcadec: Delete redundant init_get_bits call
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b11265c989
Merge commit '4d40e073dcdef335215c124d340ea156bc4bdf13'
...
* commit '4d40e073dcdef335215c124d340ea156bc4bdf13':
rtmpproto: Handle RTMP chunk size packets before the connect packet
Conflicts:
libavformat/rtmpproto.c
See: 36b9c27dae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Stephan Soller
36b9c27dae
avformat/rtmpproto: Added handling of an initial RTMP chunk size packet.
...
Fixes ticket #2911 .
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago