Michael Niedermayer
5c17377e28
Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'
...
* commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca':
fmtconvert: drop unused functions
Conflicts:
libavcodec/arm/fmtconvert_vfp_armv6.S
libavcodec/x86/fmtconvert.asm
libavcodec/x86/fmtconvert_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e82b0e6126
Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'
...
* commit 'ee964145b5d229571e00bf6883a44189d02babe2':
lavc: remove unused traces of fmtconvert usage
Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/vorbisdec.c
libavcodec/wma.c
libavcodec/wma.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ca6fee7606
Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'
...
* commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919':
tls: Pass AVOptions dictionaries through to the chained protocol
Conflicts:
libavformat/tls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c5c4e5839a
Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'
...
* commit 'e14f98c62fdf8744b07419314095d1b3248cce75':
tcp: Clarify the units for the timeout avoptions
Conflicts:
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
1fb3642317
Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'
...
* commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31':
avio: Rename avclass symbols relating to avio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Andreas Cadhalpun
e8565d21c2
avformat/flvenc: check that the codec_tag fits in the available bits
...
flags is later written with avio_w8 and if it doesn't fit in one byte it
triggers an av_assert2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Andreas Cadhalpun
732c3ebffa
avcodec/utils: use correct printf specifier in ff_set_sar
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
5705dc5276
avutil/imgutils: correctly check for negative SAR components
...
These could trigger assert failures previously
Found-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Anton Khirnov
d74a8cb7e4
fmtconvert: drop unused functions
10 years ago
Anton Khirnov
ee964145b5
lavc: remove unused traces of fmtconvert usage
...
Those decoders have been switched to float output and so do not use
fmtconvert anymore.
10 years ago
Martin Storsjö
b9d2d6843a
tls: Pass AVOptions dictionaries through to the chained protocol
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
e14f98c62f
tcp: Clarify the units for the timeout avoptions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
c86d8aed74
avio: Rename avclass symbols relating to avio
...
Don't prefix them ffio_url, which is misleading, sounding too
much like the urlprotocol layer (like ffurl_*).
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
5f1ea0bfc5
avcodec/ppc/fdctdsp: fix const warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
94f5ac93d7
avcodec/vc1_block: Optimize vc1_decode_i_block_adv()
...
9127 -> 8936 decicycles (fate-suite/vc1/SA10143.vc1)
13855 -> 10976 decicycles (fate-suite/vc1/SA20021.vc1)
tests done by the author over this function but with the whole
patchset applied not just this commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
21581182ca
avcodec/vc1_block: Optimize vc1_decode_i_block()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
80a0daa0f6
avcodec/vc1_block: cosmetics
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
137fbab11b
avcodec/vc1_block: move early exit code up in ff_vc1_pred_dc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
9914502264
avcodec/vc1_block: Use av_clip_uintp2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
ec908ce427
avcodec/vc1_block: Optimize vc1_decode_ac_coeff()
...
Avoid branches in sign handling
Move local variables to where they are used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
ccad34e3ca
avcodec/vc1_block: Simplify dcdiff initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
bd55f01c96
avcodec/vc1_block: Simplify dir_ptr / pred initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
f6b195cfb9
avcodec/vc1: Simplify pred/mc loops
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
d8e030c3cc
avcodec/vc1: Simplify dmv_y initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
751883c602
avcodec/vc1: Simplify code setting and using extend_x/y
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
71de5542bb
avcodec/vc1: Make init_block_index() inline
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
e2edb10f8e
avcodec/vc1: use uint8_t for size_table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
53cb0babb4
avcodec/vc1: simplify offset table and access
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
5ee3a40f1c
ffmpeg: Fix -vstats when coded_frame is not set
...
There are several encoders which do not set coded_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Niklas Haas
888a33c070
lavc/pngenc: Support writing colorspace tags.
...
These are defined in http://www.w3.org/TR/PNG/#11addnlcolinfo .
10 years ago
Michael Niedermayer
0a23129bfc
avformat: Add prefix to get_codec_guid()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ae20682f6b
swscale: Add prefix to updateMMXDitherTables()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4d00860ac7
swresample: Add prefix to soxr_resampler
...
also move declaration to header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
bf6102044d
avcodec/dvdec: Make dv_iweight_720_c static
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
23a90768a8
avcodec/v210dec: Add ff prefix to v210_x86_init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
b37c3396cd
avcodec/h264: Add ff_ prefix to the shared h264_init_dequant_tables() function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Christophe Gisquet
60bdc868b9
lavf/mov: correct printf specifier
...
The type is int64_t.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
0e699676f9
avcodec/snow: mark dwt init as av_cold
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
22a80272ae
avcodec/diracdsp: Mark ff_diracdsp_init() as av_cold
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
f8b743b9e6
avcodec/mjpegenc: Mark ff_mjpeg_encode_close() as av_cold
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
78cd9c5671
postproc: mark alloc/free context functions as av_cold
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Derek Buitenhuis
a22032281c
movenc: Write 'colr' box correctly for MP4
...
This also restricts it to MOV and MP4, since it is only
defined for those formats.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
10 years ago
Clément Bœsch
3e0ae19f86
avfilter/palettegen: fix frame mem leak
10 years ago
Michael Niedermayer
d490b26fcb
avformat/ffmenc: Use ffio_free_dyn_buf()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
629a03a912
avformat/rtpdec_vp9: Use ffio_free_dyn_buf()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Paul B Mahol
aa7a2fa58f
avcodec/hqx: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
Paul B Mahol
5440076303
avcodec/hqx: fix typo
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
Michael Niedermayer
007498fc1a
swscale/utils: clear formatConvBuffer on allocation
...
Fixes use of uninitialized memory
Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Andreas Cadhalpun
d0b8640f75
avformat/bit: only accept the g729 codec and 1 channel
...
Other codecs/channel numbers are not supported by this muxer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Andreas Cadhalpun
eeda2c3de8
avformat/bit: check that pkt->size is 10 in write_packet
...
Ohter packet sizes are not supported by this muxer.
This avoids a null pointer dereference of pkt->data.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago