]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 26 Apr 2013 09:01:00 +0000 (11:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* commit '
74685f6783e77f2545d48bd2124945ad5be39982 ':
x86: Rename dsputil_rnd_template.c to rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Apr 2013 08:47:31 +0000 (10:47 +0200)]
Merge commit '
c2cb01d418dd18e1cf997c038d37378d773121be '
* commit '
c2cb01d418dd18e1cf997c038d37378d773121be ':
lavf: introduce AVFMT_TS_NEGATIVE
Conflicts:
libavformat/avformat.h
libavformat/mux.c
tests/ref/lavf/asf
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/ts
tests/ref/seek/lavf-asf
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-mpg
tests/ref/seek/lavf-ts
This commit does not change the default ts behaviour, such
change will, if its done, be done separately.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Apr 2013 01:44:05 +0000 (03:44 +0200)]
vc1dec: remove interlaced warning
While not yet bugfree, the warning is IMHO no longer appropriate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
highgod0401 [Thu, 25 Apr 2013 11:32:13 +0000 (19:32 +0800)]
lavfi/unsharp: add opencl unsharp filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
highgod0401 [Thu, 25 Apr 2013 11:28:40 +0000 (19:28 +0800)]
lavu/opencl:add opencl set param function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Apr 2013 21:23:12 +0000 (23:23 +0200)]
fate: re-enable fate-acodec-dca2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Apr 2013 19:32:19 +0000 (21:32 +0200)]
vc1dec: Try to fix vc1_mc_4mv_chroma4() parameters
This fixes several chroma artifacts in several videos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Apr 2013 19:30:41 +0000 (21:30 +0200)]
vc1dec: add avg & variable direction support to vc1_mc_4mv_chroma4()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Apr 2013 19:31:18 +0000 (21:31 +0200)]
vc1dsp: add avg_no_rnd_vc1_chroma_mc4_c()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Apr 2013 18:35:35 +0000 (20:35 +0200)]
vc1dec: fix doxy for vc1_mc_4mv_chroma4()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 25 Apr 2013 20:17:05 +0000 (20:17 +0000)]
vima: add @file doxy
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 25 Apr 2013 20:12:14 +0000 (20:12 +0000)]
vima: generate predict_table once, and share it with all decoders
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 25 Apr 2013 20:06:13 +0000 (20:06 +0000)]
lavc/cdxl: add @file doxy
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Tue, 23 Apr 2013 20:35:14 +0000 (23:35 +0300)]
x86: Rename dsputil_rnd_template.c to rnd_template.c
This makes it less confusing when this template is shared both by
dsputil and by hpeldsp.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Thu, 25 Apr 2013 18:39:30 +0000 (18:39 +0000)]
fate: update dca test and disable dca2 test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 25 Apr 2013 17:03:37 +0000 (17:03 +0000)]
lavfi/noise: remove get_video_buffer, its redundant now
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 25 Apr 2013 17:00:36 +0000 (17:00 +0000)]
lavfi/noise: add missing emms_c()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 25 Apr 2013 16:52:29 +0000 (16:52 +0000)]
lavfi/telecine: show time base change too
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 24 Apr 2013 09:41:36 +0000 (09:41 +0000)]
dcaenc: update
Long story short: previous code was useless and was port of older
dcaenc, this commit just "sync" with current dcaenc, hopefuly
making this encoder more useful.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 25 Apr 2013 14:01:42 +0000 (16:01 +0200)]
avcodec/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Apr 2013 13:55:01 +0000 (15:55 +0200)]
avcodec/pthread: Make sure ff_thread_finish_setup() conditions match
Prevents warning from being shown due to multiple calls.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Apr 2013 00:31:58 +0000 (02:31 +0200)]
vc1dec: drop mv_f_last, simplify code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 25 Apr 2013 09:26:33 +0000 (11:26 +0200)]
doc/filters: put vidstab filters documentation in a sensible order
Stefano Sabatini [Wed, 24 Apr 2013 21:42:22 +0000 (23:42 +0200)]
doc/filters: remove "q" constant docs for noise mode
It was removed in
62447248f3e5eb95dbd9f123696321903d4d0921 .
Stefano Sabatini [Wed, 24 Apr 2013 16:39:49 +0000 (18:39 +0200)]
doc: remove all-components.texi, include its content verbatim
Force re-generation of the manuals when an included file is modified.
The current dependency generation system is enable to track nested
inclusions.
The drawback is that the files will be generated even when there is no
strict need (for example if filters.texi is modified, ffmpeg.1 is
rebuilt), thus it trades a false negative with a false positive.
Luca Barbato [Wed, 3 Apr 2013 12:11:10 +0000 (14:11 +0200)]
lavf: introduce AVFMT_TS_NEGATIVE
Most formats do not support negative timestamps, shift them to avoid
unexpected behaviour and a number of bad crashes.
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Thu, 25 Apr 2013 07:54:11 +0000 (09:54 +0200)]
Merge commit '
fc18cc44ebfae07da153dc782572e7ce2f6fe47d '
* commit '
fc18cc44ebfae07da153dc782572e7ce2f6fe47d ':
fate: add CVFC1_Sony_C to h264 conformance tests
doc/APIchanges: add missing hashes and dates
Conflicts:
doc/APIchanges
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 24 Apr 2013 20:30:21 +0000 (20:30 +0000)]
lavc: remove unused put_bits.h headers
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Wed, 24 Apr 2013 22:56:36 +0000 (00:56 +0200)]
lavfi/subtitles: zero-init AVSubtitle.
This avoids invalid free when the stream id doesn't match the packet
stream index.
Ticket #2501
Michael Niedermayer [Wed, 24 Apr 2013 21:56:44 +0000 (23:56 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: check decoded subtitles encoding.
lavu: fix GET_UTF8 macro.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 19:56:34 +0000 (21:56 +0200)]
vc1dec: drop old use_ic code from vc1_b_mc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 18:27:34 +0000 (20:27 +0200)]
vc1: use use_ic instead of shuffling mv_mode around
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 18:41:31 +0000 (20:41 +0200)]
vc1dec: Implement intensity compensation for vc1_interp_mc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 18:40:12 +0000 (20:40 +0200)]
vc1dec: redesign the intensity compensation
The existing implementation had little to do with VC1.
This could be implemented by adjusting the reference frames
ithemselfs but that would make frame multi-threading difficult.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 24 Apr 2013 18:12:59 +0000 (20:12 +0200)]
lavfi: add timeline support in {de,remove}logo.
Both don't change anything in the context between frames.
Nicolas George [Sun, 7 Apr 2013 07:51:23 +0000 (09:51 +0200)]
lavc: check decoded subtitles encoding.
Address trac ticket #2431.
Nicolas George [Sun, 21 Apr 2013 15:19:03 +0000 (17:19 +0200)]
lavu: fix GET_UTF8 macro.
Prevent 0xFE and 0xFF from being considered the start of
non-standard 7-bytes sequences. No noticeable effect on speed.
Clément Bœsch [Wed, 24 Apr 2013 17:38:06 +0000 (19:38 +0200)]
lavfi: add vidstabutils.h to SKIPHEADERS.
Fix checkheaders when vid.stab is not available.
Clément Bœsch [Wed, 24 Apr 2013 15:55:55 +0000 (17:55 +0200)]
lavfi/vidstabdetect: fix direct path.
The frame must be writable if the show option is set, otherwise pass the
frame unchanged.
Clément Bœsch [Wed, 24 Apr 2013 15:29:29 +0000 (17:29 +0200)]
lavfi/vidstab: remove mention of defaults for consistency with other filters.
Clément Bœsch [Wed, 24 Apr 2013 15:16:27 +0000 (17:16 +0200)]
lavfi/vidstab: make use of direct variable.
Clément Bœsch [Wed, 24 Apr 2013 15:13:01 +0000 (17:13 +0200)]
lavfi/vidstab: add missing flags for 2 options.
Clément Bœsch [Wed, 24 Apr 2013 15:06:43 +0000 (17:06 +0200)]
doc/filters: reword vidstab options intro.
Clément Bœsch [Wed, 24 Apr 2013 15:01:50 +0000 (17:01 +0200)]
lavfi/vidstab: consistent descriptions.
Clément Bœsch [Wed, 24 Apr 2013 15:01:26 +0000 (17:01 +0200)]
lavfi/vidstab: miscelenaous cosmetics and typo fixes.
Georg Martius [Thu, 18 Apr 2013 23:49:27 +0000 (01:49 +0200)]
lavfi: add video stabilization plugins using vid.stab library
vidstabdetect and vidstabtransform common functions for interfacing
vid.stab are in libavfilter/vidstabutils.c
Signed-off-by: Georg Martius <martius@mis.mpg.de>
Stefano Sabatini [Wed, 24 Apr 2013 08:49:59 +0000 (10:49 +0200)]
doc/filters: amend documentation for the hue filter
Make clear that the options accept an expression.
Stefano Sabatini [Wed, 24 Apr 2013 08:47:14 +0000 (10:47 +0200)]
doc/filters: introduce example in vflip filter
Stefano Sabatini [Wed, 24 Apr 2013 08:45:46 +0000 (10:45 +0200)]
doc/filters: split luma/chroma descriptions for unsharp option
Honour declaration order in filter implementation, for shorthand
consistency.
Vittorio Giovara [Fri, 22 Mar 2013 08:55:11 +0000 (09:55 +0100)]
fate: add CVFC1_Sony_C to h264 conformance tests
The sample is already included in the FATE suite, but is not tested
because cropping wasn't fully supported before.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Nicolas Bertrand [Wed, 24 Apr 2013 11:16:03 +0000 (13:16 +0200)]
MAINTAINERS: add jpeg2000 maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 13:33:11 +0000 (15:33 +0200)]
vc1: make INIT_LUT() self contained
factorize variable declarations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 13:01:08 +0000 (15:01 +0200)]
vc1dec: fix current ptr selection in vc1_mc_4mv_chroma()
No sample tried shows a difference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 12:59:49 +0000 (14:59 +0200)]
vc1dec: factorize picture pointer selection in vc1_mc_4mv_chroma()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 12:49:31 +0000 (14:49 +0200)]
vc1dec: factorize picture pointer selection code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 11:51:10 +0000 (13:51 +0200)]
vc1dec: Fix mv_f shuffling
Avoid a (confusing) memcpy()
Simpler code
Fixes a small number of artifacts in black_screen_VC-1.mkv
and several more artifacts in other videos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 11:16:27 +0000 (13:16 +0200)]
vc1dec: Fix mv_f shuffling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 10:51:28 +0000 (12:51 +0200)]
vc1: simplify code use INIT_LUT()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 08:17:20 +0000 (10:17 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Get rid of duplication between *_rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 08:11:23 +0000 (10:11 +0200)]
Merge commit '
feec9349d35b3a46d0c6a05e3b23626050b76a77 '
* commit '
feec9349d35b3a46d0c6a05e3b23626050b76a77 ':
mpegvideo: unref cur/next/prev frames when flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 08:00:58 +0000 (10:00 +0200)]
Merge commit '
6a8561dbd7c078eb75985f7011ad1ad3fda9e223 '
* commit '
6a8561dbd7c078eb75985f7011ad1ad3fda9e223 ':
x86: Factorize duplicated inline assembly snippets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 07:55:49 +0000 (09:55 +0200)]
Merge commit '
2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b '
* commit '
2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b ':
jpeg2000: Add mutlti-threading support to decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Fri, 19 Apr 2013 06:34:22 +0000 (08:34 +0200)]
doc/APIchanges: add missing hashes and dates
Michael Niedermayer [Tue, 23 Apr 2013 23:48:16 +0000 (01:48 +0200)]
avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC, Try #2
This should fix building with MSVC until someone can change the
code so it works with MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 23 Apr 2013 18:33:49 +0000 (20:33 +0200)]
doc/filters: sort multimedia filters by name
Also favor the video filter name for indexing, in case there is an a*
audio filter variant.
Stefano Sabatini [Sun, 21 Apr 2013 15:12:02 +0000 (17:12 +0200)]
lavfi/hue: rework logic for setting commands
In particular, fix h/H commands in case h and H are not specified as
initial parameters.
Martin Storsjö [Fri, 19 Apr 2013 21:14:44 +0000 (00:14 +0300)]
x86: Get rid of duplication between *_rnd_template.c
Signed-off-by: Martin Storsjö <martin@martin.st>
Hendrik Leppkes [Sat, 20 Apr 2013 09:33:56 +0000 (11:33 +0200)]
mpegvideo: unref cur/next/prev frames when flushing
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Tue, 23 Apr 2013 14:56:12 +0000 (16:56 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Read block_align from extradata when decoding qclp in aiff.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 23 Apr 2013 13:16:50 +0000 (15:16 +0200)]
Read block_align from extradata when decoding qclp in aiff.
Fixes ticket #1287.
Michael Niedermayer [Tue, 23 Apr 2013 14:13:53 +0000 (16:13 +0200)]
doc/filters: document geq rgb mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 23 Apr 2013 13:46:51 +0000 (15:46 +0200)]
avfilter/geq: rgb support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 23 Apr 2013 13:53:49 +0000 (13:53 +0000)]
avformat: fix orig_pos type to match pkt->pos
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Mon, 22 Apr 2013 09:23:47 +0000 (12:23 +0300)]
x86: Factorize duplicated inline assembly snippets
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Tue, 23 Apr 2013 10:39:23 +0000 (12:39 +0200)]
avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC
This should fix building with MSVC until someone can change the
code so it works with MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas Bertrand [Mon, 22 Apr 2013 16:49:11 +0000 (18:49 +0200)]
jpeg2000: Add mutlti-threading support to decoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Tue, 23 Apr 2013 09:01:46 +0000 (11:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Move some conditional code around to avoid unused variable warnings
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 23 Apr 2013 08:24:46 +0000 (10:24 +0200)]
Merge commit '
10f1a4d9bd8239ac64f364e0d3b6423c28230d6d '
* commit '
10f1a4d9bd8239ac64f364e0d3b6423c28230d6d ':
jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 23 Apr 2013 08:12:48 +0000 (10:12 +0200)]
Merge commit '
94660c35249e11c53b9a9f0c2f85c4335b21eda7 '
* commit '
94660c35249e11c53b9a9f0c2f85c4335b21eda7 ':
threads: always call thread_finish_setup for intra codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 23 Apr 2013 01:27:42 +0000 (03:27 +0200)]
avfilter/drawtext: add pict_type support
Fixes Ticket2470
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 15 Apr 2013 15:47:34 +0000 (17:47 +0200)]
lavfi/overlay: support timeline through the new system.
Clément Bœsch [Sat, 20 Apr 2013 12:11:21 +0000 (14:11 +0200)]
lavfi: add 'enable' command injection to filters supporting timeline.
Clément Bœsch [Mon, 8 Apr 2013 18:35:02 +0000 (20:35 +0200)]
lavfi: add timeline support.
Flag added in a few simple filters. A bunch of other filters can likely
use the feature as well.
Clément Bœsch [Mon, 15 Apr 2013 15:42:04 +0000 (17:42 +0200)]
lavfi: add frame counter into AVFilterLink and use it in filters.
Piotr Bandurski [Mon, 22 Apr 2013 20:03:09 +0000 (22:03 +0200)]
mjpegdec: Add support for 4:1:1 YUV
Fixes part of ticket 2004
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 19:37:25 +0000 (21:37 +0200)]
avcodec_get_context_defaults3: set codec_id
Fixes Ticket1996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 17:41:31 +0000 (19:41 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: Bump minor for JPEG 2000 decoder
JPEG 2000 decoder for DCinema
The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/mqc.c
libavcodec/mqc.h
libavcodec/mqcdec.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 17:22:09 +0000 (19:22 +0200)]
avcodec: rename jpeg2000 decoder to j2k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 16:47:16 +0000 (18:47 +0200)]
Merge commit '
0c15a9aa7e1654a19144eb594f9639a57fd47482 '
* commit '
0c15a9aa7e1654a19144eb594f9639a57fd47482 ':
sh4: Remove dubious aligned dsputil code
Conflicts:
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/h264chroma_init.c
libavcodec/sh4/hpeldsp.c
libavcodec/sh4/qpel.c
If someone wants to maintain the sh4 code in ffmpeg, wants to
add more optimizations, or volunteers to maintain any of
what is removed here and can confirm that they are faster.
Then please contact us!
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 16:37:39 +0000 (18:37 +0200)]
Merge commit '
b4ad7c54c878dead7dfa4838b912a530c1debe85 '
* commit '
b4ad7c54c878dead7dfa4838b912a530c1debe85 ':
x86: cavs: Refactor duplicate dspfunc macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 16:33:33 +0000 (18:33 +0200)]
Merge commit '
a0d5ca4f0a8e2c34d784d503a12af6303424ac6a '
* commit '
a0d5ca4f0a8e2c34d784d503a12af6303424ac6a ':
mxfenc: Use correct printf format specifier for int64_t
h264: Drop unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 16:28:59 +0000 (18:28 +0200)]
Merge commit '
78fa0bd0f7067868943c0899907e313414492426 '
* commit '
78fa0bd0f7067868943c0899907e313414492426 ':
x86: cavs: Put mmx-specific code into its own init function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 22 Apr 2013 02:57:48 +0000 (04:57 +0200)]
x86: Move some conditional code around to avoid unused variable warnings
Janne Grunau [Mon, 22 Apr 2013 14:08:03 +0000 (16:08 +0200)]
jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12
Janne Grunau [Mon, 22 Apr 2013 13:31:58 +0000 (15:31 +0200)]
threads: always call thread_finish_setup for intra codecs
Intra codecs do not need an update_thread_context() function and never
call ff_thread_finish_setup(). They rely on ff_thread_get_buffer()
calling it. So call it even if the get_buffer2 function pointer is
avcodec_default_get_buffer2 and it has not been called before.
Diego Biurrun [Mon, 22 Apr 2013 13:52:00 +0000 (15:52 +0200)]
avcodec: Bump minor for JPEG 2000 decoder
Nicolas Bertrand [Mon, 22 Apr 2013 09:41:01 +0000 (11:41 +0200)]
JPEG 2000 decoder for DCinema
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
highgod0401 [Mon, 22 Apr 2013 02:10:54 +0000 (10:10 +0800)]
lavu/opencl:optimize compile kernel operation
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Apr 2013 11:13:03 +0000 (13:13 +0200)]
fate: re-enable af_join test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 17 Apr 2013 12:31:41 +0000 (12:31 +0000)]
lavfi: remove mp=down3dright
Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>