16b68bd2ee
Merge commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4'
* commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4':
mpegvideo_enc: Drop unnneded initialization
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
264ba3d847
libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
736a386055
configure: check for erf() and copysign()
They are not available on some compilers.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
e3851169ee
x86/vf_ssim: add ff_ssim_4x4_line_xop
~20% faster than ssse3. Also enabled for x86_32
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
e1778fb657
x86/vf_ssim: fix some instruction comments
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
fec0485c43
Adding myself as maintainer for qsv*
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
d82d11397f
avutil/arm/intmath: return int for uint8 / uint16 clip
The C functions return uint8/16_t but that is effectively int not unsigned int
Fixes fate-filter-tblend
We do not return uint8/16_t as that would require the compiler to truncate the
values, slowing it down.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
f85bc147fb
avcodec: Implementation of AAC_fixed_decoder (SBR-module)
Add fixed poind code.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
b0414da90d
avcodec: Table creation for AAC_fixed_decoder (SBR-module)
Create tables for fixed point code.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
5499467d5d
avcodec: Template creation for AAC decoder (SBR-module)
Move the existing code to a new template file.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
a927aacbe6
movtextdec.c: Correct the highlight tags
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
10 years ago
0030613d69
avcodec/apngdec: Fix typos in decoder causing incorrect results
Signed-off-by: Donny Yang <work@kota.moe>
10 years ago
1f171de8ca
mpegvideo_enc: Drop unnneded initialization
coded_frame is already initialized where needed.
10 years ago
fdac5ff682
avcodec: loongson relocate constants of idctdsp and h264pred
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
4bd6193397
avcodec: loongson constants redefined with macros
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
7967474bd9
avfilter/af_amerge: increase max number of channels from 32 to 64
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
6de5b6cd86
avfilter/af_astats: use UINT64_C instead of the LLU suffix
Should fix compilation with vs2012
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
9ebe041e1c
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
e93ca480c9
parseutil: Add more resolution aliases
Add DCI 2k and 4k and uhd1 and uhd2.
10 years ago
cb53db144c
avformat/mp3dec: Rename sync() function to avoid build failure on android
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
bf1fd59c6a
avformat/avidec: Fix demuxing avi with broken index
Fixes: genio-avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
749f85496c
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
c239fcb948
lavc/jpeg2000: Signal lossless / bit-exact video stream.
10 years ago
32d8726a31
lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.
10 years ago
d8d2f934bd
lavc: Improve documentation for rc_max_rate and bit_rate.
Both may be set by user (libavformat) on decoding.
10 years ago
5c583b1419
avcodec/dds: Flip more R<->B cases
Fixes Ticket4665
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
36a87c2dc7
avcodec/dds: fix paletted files
Fixes Ticket4664
The changed fate tests lack red/blue shades and thus look correct
either way
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
4ebe31abf1
RELEASE: update to 2.7.git
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
2db8c42ddc
avformat/mp3dec: remove unused variable
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
a8fbb7b625
avfilter: add random video filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
eb468b0be0
avdevice/decklink: Add missing libraries when building with DeckLink support on Windows.
Signed-off-by: Chris Spencer <spencercw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
0a551cbe97
Add support for Audible AAX (and AAX+) files
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
4df66c7cd6
avformat/mp3dec: split position sync code out
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
ea8785ceda
avcodec/utils: Check that channel count is valid in avcodec_open2();
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
9c943e077b
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
qsvenc: properly handle asynchronous encoding
Conflicts:
libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
f929081f2e
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
7093e215d0
Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'
* commit '6b15874fc2c3f565732201f7907ae1112727d6ae':
af_resample: do not touch the timestamps if we are not resampling
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
2dbaec690d
ffmpeg_filter: Check that filters have connected outputs before accessing the output stream
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
bc3f19641c
Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
avconv: split creating and (re-)configuring complex filtergraphs
Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
8271a84094
avfilter: Add reverse filter
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
10 years ago
c7dd2365f4
Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'
* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
avconv: create the complex filtergraphs earlier
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
3b0534efdc
Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'
* commit '1959351aecf09fc3e90208ff775f4849801dc13f':
avconv: move the no streams failure to open_output_file()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
15fbf3e72a
Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'
* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
avconv: factor out the output stream initialization
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
edd110ee45
Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
avconv: use read_file() for reading the 2pass stats
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
247f4d1f18
Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'
* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
avconv: move handling the 2pass logfile into avconv_opt
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
db3e12a828
Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'
* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
avconv: set the encoding/decoding_needed flags earlier
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
843be56ee1
ffmpeg_opt: Fix stream copy flag for attachments
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
8534c8c77a
Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'
* commit '56c2f37727015212a404cae0f444d8bc8704d691':
avconv: drop update_sample_fmt()
Conflicts:
ffmpeg.c
No change as the removed code is not in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
3d4297f851
Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57'
* commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57':
asfdec: make nb_sub to be unsigned int
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
74aba00700
Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406'
* commit '2883ef34b59c9b427c4cfad4620c3235e5778406':
asfdec: read the replicated data in a separate function
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
Michael Niedermayer
Ivan Uskov
James Almer
Djordje Pesut
Jovan Zelincevic
Niklesh
Donny Yang
Vittorio Giovara
周晓勇
Paul B Mahol
Luca Barbato
Carl Eugen Hoyos
Chris Spencer
Vesselin Bontchev
Derek Buitenhuis