ffmpeg.git
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 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>
6 years agox86: cavs: Put mmx-specific code into its own init function
Diego Biurrun [Sat, 20 Apr 2013 20:03:19 +0000 (22:03 +0200)]
x86: cavs: Put mmx-specific code into its own init function

Before, this code was labeled as mmxext and enabled both for the
3dnow and the mmxext case.

6 years agox86: Remove some duplicate function declarations
Diego Biurrun [Sat, 20 Apr 2013 18:27:47 +0000 (20:27 +0200)]
x86: Remove some duplicate function declarations

6 years agoafifo: fix request_samples on the last frame in certain cases
Anton Khirnov [Tue, 16 Apr 2013 19:53:56 +0000 (21:53 +0200)]
afifo: fix request_samples on the last frame in certain cases

The current code can fail to return the last frame if it contains
exactly the requested number of samples.

Fixes the join filter test, which previously did not include the last
408 samples in most cases.

CC:libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoindeo4: implement haar 8x1 and 1x8 transforms
Michael Niedermayer [Mon, 22 Apr 2013 00:24:08 +0000 (02:24 +0200)]
indeo4: implement haar 8x1 and 1x8 transforms

Fixes Ticket1984
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/fade: Added ability to do video fade based on timestamp
Andy Martin [Wed, 17 Apr 2013 01:35:02 +0000 (21:35 -0400)]
lavfi/fade: Added ability to do video fade based on timestamp

6 years agoismindex: check mkdir()s return code
Michael Niedermayer [Sun, 21 Apr 2013 17:53:18 +0000 (19:53 +0200)]
ismindex: check mkdir()s return code

Fixes CID733724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/ismindex: dont ignore return code of write_fragments()
Michael Niedermayer [Sun, 21 Apr 2013 17:49:22 +0000 (19:49 +0200)]
tools/ismindex: dont ignore return code of write_fragments()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: check av_samples_get_buffer_size() return
Michael Niedermayer [Sun, 21 Apr 2013 13:55:04 +0000 (15:55 +0200)]
ffplay: check av_samples_get_buffer_size() return

Fixes CID1005310
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add interleave filters
Stefano Sabatini [Mon, 8 Apr 2013 13:16:06 +0000 (15:16 +0200)]
lavfi: add interleave filters

6 years agoriff: Factor out WAVEFORMATEX parsing
Luca Barbato [Sat, 20 Apr 2013 11:36:48 +0000 (13:36 +0200)]
riff: Factor out WAVEFORMATEX parsing

Makes the code simpler to follow.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: Add ACTRAC3+ guid
Peter Ross [Sat, 20 Apr 2013 11:36:47 +0000 (13:36 +0200)]
riff: Add ACTRAC3+ guid

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid
Peter Ross [Sat, 20 Apr 2013 11:36:46 +0000 (13:36 +0200)]
riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: Move guid structs and helper functions into riff
Peter Ross [Sat, 20 Apr 2013 11:36:45 +0000 (13:36 +0200)]
riff: Move guid structs and helper functions into riff

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: check for eof if chunk size and code are 0
Luca Barbato [Sat, 20 Apr 2013 11:36:44 +0000 (13:36 +0200)]
riff: check for eof if chunk size and code are 0

Prevent an infinite loop.

Inspired by a patch from Michael Niedermayer

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: K&R formatting cosmetics
Luca Barbato [Sat, 20 Apr 2013 11:36:43 +0000 (13:36 +0200)]
riff: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agolavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers
Stefano Sabatini [Sun, 21 Apr 2013 11:39:06 +0000 (13:39 +0200)]
lavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers

6 years agolavfi/sendcmd: fix various "in in" rerepepetitions in messages
Stefano Sabatini [Sun, 21 Apr 2013 11:35:29 +0000 (13:35 +0200)]
lavfi/sendcmd: fix various "in in" rerepepetitions in messages

6 years agolavfi/buffersink: fix possible leaks after allocation failures.
Nicolas George [Sun, 21 Apr 2013 13:33:18 +0000 (15:33 +0200)]
lavfi/buffersink: fix possible leaks after allocation failures.

Should fix Coverity CID 100531310053141005315.

6 years agolavfi: add asetrate filter.
Nicolas George [Thu, 18 Apr 2013 14:59:27 +0000 (16:59 +0200)]
lavfi: add asetrate filter.

6 years agoffmpeg_filter: fix leak on error
Michael Niedermayer [Sun, 21 Apr 2013 09:59:34 +0000 (11:59 +0200)]
ffmpeg_filter: fix leak on error

Fixes: CID1005311
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoinit_vlc_sparse: fix leak on error
Michael Niedermayer [Sun, 21 Apr 2013 09:55:19 +0000 (11:55 +0200)]
init_vlc_sparse: fix leak on error

Fixes CID1005312

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter/af_atempo: Avoid round-off error build-up, ticket #2484
Pavel Koshevoy [Sun, 21 Apr 2013 03:34:25 +0000 (21:34 -0600)]
libavfilter/af_atempo: Avoid round-off error build-up, ticket #2484

Current method for constraining fragment position drift suffers from
round-off error build up.

Instead of calculating cumulative drift as a sum of input fragment
position corrections, it is more accurate to calculate drift as the
difference between current fragment position and the ideal position
specified by the tempo scale factor.

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter/af_atempo: Fix uninitialized memory access
Pavel Koshevoy [Sun, 21 Apr 2013 03:33:55 +0000 (21:33 -0600)]
libavfilter/af_atempo: Fix uninitialized memory access

valgrind reported uninitialized memory access which was caused by
incorrect number of samples being passed to push_samples(..)

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 21 Apr 2013 07:53:49 +0000 (09:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: hpeldsp: Include attributes.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: initialize coeff_per_sb_select from bit_rate
Roberto Togni [Sat, 20 Apr 2013 21:57:18 +0000 (23:57 +0200)]
qdm2: initialize coeff_per_sb_select from bit_rate

The value of coeff_per_sb_select depends on the bit rate, not on
sub_sampling.
Also remove the calculation of tmp, no longer needed.

Fixes tickets #1868 and #742 (only audio part)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxf_timestamp_to_str: dont leave uninitilaized fields in time.
Michael Niedermayer [Sat, 20 Apr 2013 22:12:14 +0000 (00:12 +0200)]
mxf_timestamp_to_str: dont leave uninitilaized fields in time.

Fixes CID1005318
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_samples_alloc_array_and_samples: Fix sizeof type.
Michael Niedermayer [Sat, 20 Apr 2013 20:55:47 +0000 (22:55 +0200)]
av_samples_alloc_array_and_samples: Fix sizeof type.

Fixes CID1005317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 20 Apr 2013 20:00:58 +0000 (22:00 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only do early frame drop if video queue is not empty
  ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0
  ffplay: simplify aspect ratio calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: change asserts to av_asserts
Michael Niedermayer [Sat, 20 Apr 2013 19:26:17 +0000 (21:26 +0200)]
avcodec/mpegvideo: change asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/deshake_kernel: fix reset value bug of deshake kernel
highgod0401 [Sat, 20 Apr 2013 03:21:08 +0000 (11:21 +0800)]
avfilter/deshake_kernel: fix reset value bug of deshake kernel

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/stereo3d: support more formats for non-anaglyph outputs
Paul B Mahol [Sat, 20 Apr 2013 14:25:17 +0000 (14:25 +0000)]
lavfi/stereo3d: support more formats for non-anaglyph outputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffplay: only do early frame drop if video queue is not empty
Marton Balint [Tue, 16 Apr 2013 18:34:28 +0000 (20:34 +0200)]
ffplay: only do early frame drop if video queue is not empty

Fixes ticket #2446.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use AV_NOPTS_VALUE video frame pts instead of using 0
Marton Balint [Mon, 15 Apr 2013 20:12:18 +0000 (22:12 +0200)]
ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0

Assuming 0 pts may lead to bad framedrop decisions...

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: simplify aspect ratio calculation
Marton Balint [Mon, 15 Apr 2013 20:03:19 +0000 (22:03 +0200)]
ffplay: simplify aspect ratio calculation

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 20 Apr 2013 14:24:07 +0000 (16:24 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Remove unused inline asm instruction defines
  vc1: Remove now unused variables

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'
Michael Niedermayer [Sat, 20 Apr 2013 14:19:51 +0000 (16:19 +0200)]
Merge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'

* commit '287c8db39e71af7047e551bbfd1264d771cccbc9':
  cosmetics: bfin: Fix indentation in the dsputil init function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'
Michael Niedermayer [Sat, 20 Apr 2013 14:07:20 +0000 (16:07 +0200)]
Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'

* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
  dsputil: Remove non-8bpp draw_edge

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'
Michael Niedermayer [Sat, 20 Apr 2013 14:03:32 +0000 (16:03 +0200)]
Merge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'

* commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d':
  dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge

Conflicts:
libavcodec/dsputil.c

No difference as this has been part of ffmpeg since a while and
the rebased commit does also not introduce new changes.

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