ffmpeg.git
6 years agovima: generate predict_table once, and share it with all decoders
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>
6 years agolavc/cdxl: add @file doxy
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>
6 years agofate: update dca test and disable dca2 test
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>
6 years agolavfi/noise: remove get_video_buffer, its redundant now
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>
6 years agolavfi/noise: add missing emms_c()
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>
6 years agolavfi/telecine: show time base change too
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>
6 years agodcaenc: update
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>
6 years agoavcodec/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code
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>
6 years agoavcodec/pthread: Make sure ff_thread_finish_setup() conditions match
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>
6 years agovc1dec: drop mv_f_last, simplify code
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>
6 years agodoc/filters: put vidstab filters documentation in a sensible order
Stefano Sabatini [Thu, 25 Apr 2013 09:26:33 +0000 (11:26 +0200)]
doc/filters: put vidstab filters documentation in a sensible order

6 years agodoc/filters: remove "q" constant docs for noise mode
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.

6 years agodoc: remove all-components.texi, include its content verbatim
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.

6 years agoMerge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
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>
6 years agolavc: remove unused put_bits.h headers
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>
6 years agolavfi/subtitles: zero-init AVSubtitle.
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

6 years agoMerge remote-tracking branch 'cigaes/master'
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>
6 years agovc1dec: drop old use_ic code from vc1_b_mc
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>
6 years agovc1: use use_ic instead of shuffling mv_mode around
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>
6 years agovc1dec: Implement intensity compensation for vc1_interp_mc()
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>
6 years agovc1dec: redesign the intensity compensation
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>
6 years agolavfi: add timeline support in {de,remove}logo.
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.

6 years agolavc: check decoded subtitles encoding.
Nicolas George [Sun, 7 Apr 2013 07:51:23 +0000 (09:51 +0200)]
lavc: check decoded subtitles encoding.

Address trac ticket #2431.

6 years agolavu: fix GET_UTF8 macro.
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.

6 years agolavfi: add vidstabutils.h to SKIPHEADERS.
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.

6 years agolavfi/vidstabdetect: fix direct path.
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.

6 years agolavfi/vidstab: remove mention of defaults for consistency with other filters.
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.

6 years agolavfi/vidstab: make use of direct variable.
Clément Bœsch [Wed, 24 Apr 2013 15:16:27 +0000 (17:16 +0200)]
lavfi/vidstab: make use of direct variable.

6 years agolavfi/vidstab: add missing flags for 2 options.
Clément Bœsch [Wed, 24 Apr 2013 15:13:01 +0000 (17:13 +0200)]
lavfi/vidstab: add missing flags for 2 options.

6 years agodoc/filters: reword vidstab options intro.
Clément Bœsch [Wed, 24 Apr 2013 15:06:43 +0000 (17:06 +0200)]
doc/filters: reword vidstab options intro.

6 years agolavfi/vidstab: consistent descriptions.
Clément Bœsch [Wed, 24 Apr 2013 15:01:50 +0000 (17:01 +0200)]
lavfi/vidstab: consistent descriptions.

6 years agolavfi/vidstab: miscelenaous cosmetics and typo fixes.
Clément Bœsch [Wed, 24 Apr 2013 15:01:26 +0000 (17:01 +0200)]
lavfi/vidstab: miscelenaous cosmetics and typo fixes.

6 years agolavfi: add video stabilization plugins using vid.stab library
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>
6 years agodoc/filters: amend documentation for the hue filter
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.

6 years agodoc/filters: introduce example in vflip filter
Stefano Sabatini [Wed, 24 Apr 2013 08:47:14 +0000 (10:47 +0200)]
doc/filters: introduce example in vflip filter

6 years agodoc/filters: split luma/chroma descriptions for unsharp option
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.

6 years agofate: add CVFC1_Sony_C to h264 conformance tests
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>
6 years agoMAINTAINERS: add jpeg2000 maintainer
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>
6 years agovc1: make INIT_LUT() self contained
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>
6 years agovc1dec: fix current ptr selection in vc1_mc_4mv_chroma()
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>
6 years agovc1dec: factorize picture pointer selection in vc1_mc_4mv_chroma()
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>
6 years agovc1dec: factorize picture pointer selection code
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>
6 years agovc1dec: Fix mv_f shuffling
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>
6 years agovc1dec: Fix mv_f shuffling
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>
6 years agovc1: simplify code use INIT_LUT()
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit 'feec9349d35b3a46d0c6a05e3b23626050b76a77'
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>
6 years agoMerge commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223'
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>
6 years agoMerge commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b'
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>
6 years agodoc/APIchanges: add missing hashes and dates
Anton Khirnov [Fri, 19 Apr 2013 06:34:22 +0000 (08:34 +0200)]
doc/APIchanges: add missing hashes and dates

6 years agoavcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC, Try #2
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>
6 years agodoc/filters: sort multimedia filters by name
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.

6 years agolavfi/hue: rework logic for setting commands
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.

6 years agox86: Get rid of duplication between *_rnd_template.c
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>
6 years agompegvideo: unref cur/next/prev frames when flushing
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>
6 years agoMerge remote-tracking branch 'cehoyos/master'
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>
6 years agoRead block_align from extradata when decoding qclp in aiff.
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.

6 years agodoc/filters: document geq rgb mode
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>
6 years agoavfilter/geq: rgb support
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>
6 years agoavformat: fix orig_pos type to match pkt->pos
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>
6 years agox86: Factorize duplicated inline assembly snippets
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>
6 years agoavcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC
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>
6 years agojpeg2000: Add mutlti-threading support to decoder
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d'
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>
6 years agoMerge commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7'
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>
6 years agoavfilter/drawtext: add pict_type support
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>
6 years agolavfi/overlay: support timeline through the new system.
Clément Bœsch [Mon, 15 Apr 2013 15:47:34 +0000 (17:47 +0200)]
lavfi/overlay: support timeline through the new system.

6 years agolavfi: add 'enable' command injection to filters supporting timeline.
Clément Bœsch [Sat, 20 Apr 2013 12:11:21 +0000 (14:11 +0200)]
lavfi: add 'enable' command injection to filters supporting timeline.

6 years agolavfi: add timeline support.
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.

6 years agolavfi: add frame counter into AVFilterLink and use it in filters.
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.

6 years agomjpegdec: Add support for 4:1:1 YUV
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>
6 years agoavcodec_get_context_defaults3: set codec_id
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoavcodec: rename jpeg2000 decoder to j2k
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>
6 years agoMerge commit '0c15a9aa7e1654a19144eb594f9639a57fd47482'
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>
6 years agoMerge commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85'
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>
6 years agoMerge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'
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>
6 years agoMerge commit '78fa0bd0f7067868943c0899907e313414492426'
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>
6 years agox86: Move some conditional code around to avoid unused variable warnings
Diego Biurrun [Mon, 22 Apr 2013 02:57:48 +0000 (04:57 +0200)]
x86: Move some conditional code around to avoid unused variable warnings

6 years agojpeg2kdec: output is native endian AV_PIX_FMT_XYZ12
Janne Grunau [Mon, 22 Apr 2013 14:08:03 +0000 (16:08 +0200)]
jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12

6 years agothreads: always call thread_finish_setup for intra codecs
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.

6 years agoavcodec: Bump minor for JPEG 2000 decoder
Diego Biurrun [Mon, 22 Apr 2013 13:52:00 +0000 (15:52 +0200)]
avcodec: Bump minor for JPEG 2000 decoder

6 years agoJPEG 2000 decoder for DCinema
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>
6 years agolavu/opencl:optimize compile kernel operation
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>
6 years agofate: re-enable af_join test
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>
6 years agolavfi: remove mp=down3dright
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>
6 years agodoc/filters: add examples for stereo3d
Paul B Mahol [Mon, 22 Apr 2013 10:15:14 +0000 (10:15 +0000)]
doc/filters: add examples for stereo3d

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 22 Apr 2013 11:07:12 +0000 (13:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Remove some duplicate function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'
Michael Niedermayer [Mon, 22 Apr 2013 11:02:20 +0000 (13:02 +0200)]
Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'

* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
  afifo: fix request_samples on the last frame in certain cases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b845f5e97b655de0a191f736594777fec9754cf5'
Michael Niedermayer [Mon, 22 Apr 2013 10:53:58 +0000 (12:53 +0200)]
Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'

* commit 'b845f5e97b655de0a191f736594777fec9754cf5':
  riff: Factor out WAVEFORMATEX parsing

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25'
Michael Niedermayer [Mon, 22 Apr 2013 10:40:56 +0000 (12:40 +0200)]
Merge commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25'

* commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25':
  riff: Add ACTRAC3+ guid

No change, this commit was in ffmpeg already with this formating

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'
Michael Niedermayer [Mon, 22 Apr 2013 10:36:29 +0000 (12:36 +0200)]
Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'

* commit 'a3bf80a5aea577663354bd538e345b283bcb73de':
  riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'
Michael Niedermayer [Mon, 22 Apr 2013 10:04:10 +0000 (12:04 +0200)]
Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'

* commit 'e544782623caf1eb4b2429e9c4f35d6b627accba':
  riff: Move guid structs and helper functions into riff

Conflicts:
libavformat/asf.h
libavformat/riff.c
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosh4: Remove dubious aligned dsputil code
Diego Biurrun [Thu, 18 Apr 2013 17:26:18 +0000 (19:26 +0200)]
sh4: Remove dubious aligned dsputil code

The code represents a considerable maintenance burden and it is not
clear that it gives a noticeable benefit to outweigh this after 10
years of improvements in compiler technology since its creation.

6 years agox86: cavs: Refactor duplicate dspfunc macro
Diego Biurrun [Sat, 20 Apr 2013 20:13:01 +0000 (22:13 +0200)]
x86: cavs: Refactor duplicate dspfunc macro

6 years agomxfenc: Use correct printf format specifier for int64_t
Diego Biurrun [Mon, 22 Apr 2013 02:50:45 +0000 (04:50 +0200)]
mxfenc: Use correct printf format specifier for int64_t

libavformat/mxfenc.c:1861:9: warning: format '%lld' expects argument of type 'long long int', but argument 5 has type 'int64_t' [-Wformat]

6 years agoh264: Drop unused variable
Diego Biurrun [Mon, 22 Apr 2013 00:53:58 +0000 (02:53 +0200)]
h264: Drop unused variable

6 years agoMerge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'
Michael Niedermayer [Mon, 22 Apr 2013 09:07:50 +0000 (11:07 +0200)]
Merge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'

* commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0':
  riff: check for eof if chunk size and code are 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1c88617b9421c9af8ae961c05d2381b19c585026'
Michael Niedermayer [Mon, 22 Apr 2013 08:50:05 +0000 (10:50 +0200)]
Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'

* commit '1c88617b9421c9af8ae961c05d2381b19c585026':
  riff: K&R formatting cosmetics

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>