16b68bd2ee
Merge commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4'
...
* commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4':
mpegvideo_enc: Drop unnneded initialization
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:20:51 +02:00
264ba3d847
libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 19:57:57 +02:00
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>
2015-07-20 13:18:09 -03:00
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>
2015-07-20 13:18:05 -03:00
e1778fb657
x86/vf_ssim: fix some instruction comments
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-20 13:17:58 -03:00
fec0485c43
Adding myself as maintainer for qsv*
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 17:31:36 +02:00
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>
2015-07-20 17:20:16 +02:00
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>
2015-07-20 17:20:16 +02:00
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>
2015-07-20 17:20:16 +02:00
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>
2015-07-20 17:20:16 +02:00
a927aacbe6
movtextdec.c: Correct the highlight tags
...
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-07-20 08:16:19 -07:00
40cf1bbacc
Deprecate avctx.coded_frame
...
The rationale is that coded_frame was only used to communicate key_frame,
pict_type and quality to the caller, as well as a few other random fields,
in a non predictable, let alone consistent way.
There was agreement that there was no use case for coded_frame, as it is
a full-sized AVFrame container used for just 2-3 int-sized properties,
which shouldn't even belong into the AVCodecContext in the first place.
The appropriate AVPacket flag can be used instead of key_frame, while
quality is exported with the new AVPacketSideData quality factor.
There is no replacement for the other fields as they were unreliable,
mishandled or just not used at all.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 15:06:50 +01:00
5d3addb937
Add a quality factor packet side data
...
This is necessary to preserve the quality information currently exported
with coded_frame. Add the new side data to every encoder that needs it,
and use it in avconv.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 15:06:47 +01:00
0030613d69
avcodec/apngdec: Fix typos in decoder causing incorrect results
...
Signed-off-by: Donny Yang <work@kota.moe>
2015-07-20 13:46:50 +00:00
d6604b29ef
Gather all coded_frame allocations and free functions to a single place
...
Allocating coded_frame is what most encoders do anyway, so it makes
sense to always allocate and free it in a single place. Moreover a lot
of encoders freed the frame with av_freep() instead of the correct API
av_frame_free().
This bring uniformity to encoder behaviour and prevents applications
from erroneusly accessing this field when not allocated. Additionally
this helps isolating encoders that export information with coded_frame,
and heavily simplifies its deprecation.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 14:16:15 +01:00
91f9b6579a
flashsvenc: Keep coded_frame.key_frame a write-only variable
2015-07-20 14:13:42 +01:00
75c1ed2e4c
ffv1enc: Use input frame to set SAR and interlacing
2015-07-20 14:13:42 +01:00
10a9149de2
ffv1enc: Keep coded_frame.key_frame a write-only variable
2015-07-20 14:13:42 +01:00
efc618aff9
qtrleenc: Keep coded_frame.key_frame a write-only variable
2015-07-20 14:13:42 +01:00
f3b4a92241
libtheoraenc: Keep coded_frame.key_frame a write-only variable
2015-07-20 14:13:42 +01:00
d6006dd9f0
libvpxenc: Do not entangle coded_frame
...
Keep coded_frame.key_frame a write-only variable.
2015-07-20 14:13:42 +01:00
7fc8d8a1b3
libxvid: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
56672aeaee
svq1enc: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
05fb4c9aaf
proresenc: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
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>
2015-07-20 14:12:48 +01:00
95e2317ed8
roqvideoenc: Drop unneeded initialization
...
Its fields are never initialized to begin with.
2015-07-20 13:57:25 +01:00
1f171de8ca
mpegvideo_enc: Drop unnneded initialization
...
coded_frame is already initialized where needed.
2015-07-20 13:57:18 +01:00
fdac5ff682
avcodec: loongson relocate constants of idctdsp and h264pred
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 14:29:22 +02:00
4bd6193397
avcodec: loongson constants redefined with macros
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 14:29:22 +02:00
7967474bd9
avfilter/af_amerge: increase max number of channels from 32 to 64
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-20 09:59:59 +00:00
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>
2015-07-20 00:05:20 -03:00
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>
2015-07-20 04:32:28 +02:00
e93ca480c9
parseutil: Add more resolution aliases
...
Add DCI 2k and 4k and uhd1 and uhd2.
2015-07-20 04:05:48 +02:00
cb53db144c
avformat/mp3dec: Rename sync() function to avoid build failure on android
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 02:41:44 +02:00
bf1fd59c6a
avformat/avidec: Fix demuxing avi with broken index
...
Fixes: genio-avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 02:11:49 +02:00
749f85496c
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 02:11:48 +02:00
c239fcb948
lavc/jpeg2000: Signal lossless / bit-exact video stream.
2015-07-20 00:28:13 +02:00
32d8726a31
lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.
2015-07-20 00:27:52 +02:00
d8d2f934bd
lavc: Improve documentation for rc_max_rate and bit_rate.
...
Both may be set by user (libavformat) on decoding.
2015-07-20 00:27:51 +02:00
5c583b1419
avcodec/dds: Flip more R<->B cases
...
Fixes Ticket4665
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 00:03:11 +02:00
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>
2015-07-19 23:26:59 +02:00
4ebe31abf1
RELEASE: update to 2.7.git
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-19 17:52:31 -03:00
2db8c42ddc
avformat/mp3dec: remove unused variable
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-19 17:47:28 -03:00
a8fbb7b625
avfilter: add random video filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-19 19:01:00 +00:00
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>
2015-07-19 20:32:41 +02:00
0a551cbe97
Add support for Audible AAX (and AAX+) files
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 20:28:39 +02:00
4df66c7cd6
avformat/mp3dec: split position sync code out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 19:31:08 +02:00
ea8785ceda
avcodec/utils: Check that channel count is valid in avcodec_open2();
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 18:17:45 +02:00
9c943e077b
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
...
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
qsvenc: properly handle asynchronous encoding
Conflicts:
libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:34:12 +02:00
f929081f2e
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
...
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:13:35 +02:00
Michael Niedermayer
Ivan Uskov
James Almer
Djordje Pesut
Jovan Zelincevic
Niklesh
Vittorio Giovara
Donny Yang
周晓勇
Paul B Mahol
Luca Barbato
Carl Eugen Hoyos
Chris Spencer
Vesselin Bontchev