Michael Niedermayer
70c648db89
Merge commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e'
...
* commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e':
libxvid: Do not entangle coded_frame
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
033144c0d1
Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'
...
* commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919':
svq1enc: Do not entangle coded_frame
Conflicts:
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
f2a581e2ee
Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'
...
* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
proresenc: Do not entangle coded_frame
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
a99f0ad194
Merge commit '91767360d86ac786571593ab11c7291010ab3829'
...
* commit '91767360d86ac786571593ab11c7291010ab3829':
a64multienc: Do not entangle coded_frame
Conflicts:
libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
6497aab022
Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'
...
* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
roqvideoenc: Drop unneeded initialization
Conflicts:
libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
16b68bd2ee
Merge commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4'
...
* commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4':
mpegvideo_enc: Drop unnneded initialization
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Ivan Uskov
264ba3d847
libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
James Almer
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>
9 years ago
James Almer
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>
9 years ago
James Almer
e1778fb657
x86/vf_ssim: fix some instruction comments
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
Ivan Uskov
fec0485c43
Adding myself as maintainer for qsv*
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
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>
9 years ago
Djordje Pesut
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>
9 years ago
Jovan Zelincevic
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>
9 years ago
Djordje Pesut
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>
9 years ago
Niklesh
a927aacbe6
movtextdec.c: Correct the highlight tags
...
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
9 years ago
Donny Yang
0030613d69
avcodec/apngdec: Fix typos in decoder causing incorrect results
...
Signed-off-by: Donny Yang <work@kota.moe>
9 years ago
Vittorio Giovara
7fc8d8a1b3
libxvid: Do not entangle coded_frame
9 years ago
Vittorio Giovara
56672aeaee
svq1enc: Do not entangle coded_frame
9 years ago
Vittorio Giovara
05fb4c9aaf
proresenc: Do not entangle coded_frame
9 years ago
Vittorio Giovara
91767360d8
a64multienc: Do not entangle coded_frame
...
This change (and the following ones of the same kind) is mainly to
simplify wrapping this section with an #if FF_API block later on.
No functional changes are applied, the fields of the context coded_frame
fields are directly initialized, instead of keeping a reference to the
coded_frame itself.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years ago
Vittorio Giovara
95e2317ed8
roqvideoenc: Drop unneeded initialization
...
Its fields are never initialized to begin with.
9 years ago
Vittorio Giovara
1f171de8ca
mpegvideo_enc: Drop unnneded initialization
...
coded_frame is already initialized where needed.
9 years ago
周晓勇
fdac5ff682
avcodec: loongson relocate constants of idctdsp and h264pred
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
周晓勇
4bd6193397
avcodec: loongson constants redefined with macros
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Paul B Mahol
7967474bd9
avfilter/af_amerge: increase max number of channels from 32 to 64
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
James Almer
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>
9 years ago
Michael Niedermayer
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>
9 years ago
Luca Barbato
e93ca480c9
parseutil: Add more resolution aliases
...
Add DCI 2k and 4k and uhd1 and uhd2.
9 years ago
Michael Niedermayer
cb53db144c
avformat/mp3dec: Rename sync() function to avoid build failure on android
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
bf1fd59c6a
avformat/avidec: Fix demuxing avi with broken index
...
Fixes: genio-avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
749f85496c
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Carl Eugen Hoyos
c239fcb948
lavc/jpeg2000: Signal lossless / bit-exact video stream.
9 years ago
Carl Eugen Hoyos
32d8726a31
lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.
9 years ago
Carl Eugen Hoyos
d8d2f934bd
lavc: Improve documentation for rc_max_rate and bit_rate.
...
Both may be set by user (libavformat) on decoding.
9 years ago
Michael Niedermayer
5c583b1419
avcodec/dds: Flip more R<->B cases
...
Fixes Ticket4665
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
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>
9 years ago
James Almer
4ebe31abf1
RELEASE: update to 2.7.git
...
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
James Almer
2db8c42ddc
avformat/mp3dec: remove unused variable
...
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
Paul B Mahol
a8fbb7b625
avfilter: add random video filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Chris Spencer
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>
9 years ago
Vesselin Bontchev
0a551cbe97
Add support for Audible AAX (and AAX+) files
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
4df66c7cd6
avformat/mp3dec: split position sync code out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
ea8785ceda
avcodec/utils: Check that channel count is valid in avcodec_open2();
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
9c943e077b
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
...
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
qsvenc: properly handle asynchronous encoding
Conflicts:
libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
f929081f2e
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
...
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
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>
9 years ago
Michael Niedermayer
2dbaec690d
ffmpeg_filter: Check that filters have connected outputs before accessing the output stream
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
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>
9 years ago
Derek Buitenhuis
8271a84094
avfilter: Add reverse filter
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago