]> git.sesse.net Git - ffmpeg/log
ffmpeg
11 years agolavc: copy subtitle_header when copying context.
Nicolas George [Tue, 23 Apr 2013 18:18:00 +0000 (20:18 +0200)]
lavc: copy subtitle_header when copying context.

Fix trac ticket #2489.

11 years agolavf: data muxer and demuxer.
Nicolas George [Mon, 29 Apr 2013 18:46:00 +0000 (20:46 +0200)]
lavf: data muxer and demuxer.

Allow to use tools designed to work with demuxers, muxers
and packets (for example ffmpeg itself) to process raw byte
streams (like aviocat).

11 years agoMerge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
Michael Niedermayer [Wed, 1 May 2013 09:26:53 +0000 (11:26 +0200)]
Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'

* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
  lavfi: add trim and atrim filters.

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'
Michael Niedermayer [Wed, 1 May 2013 08:59:21 +0000 (10:59 +0200)]
Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'

* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
  lavfi: add an asetpts filter

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_setpts.c
libavfilter/setpts.c
libavfilter/version.h
libavfilter/vf_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'
Michael Niedermayer [Wed, 1 May 2013 08:24:45 +0000 (10:24 +0200)]
Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'

* commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0':
  vf_setpts: cosmetics, reformat

Conflicts:
libavfilter/f_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'
Michael Niedermayer [Wed, 1 May 2013 08:16:27 +0000 (10:16 +0200)]
Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'

* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
  graphparser: only print filter arguments if they are non-NULL
  af_channelmap: ensure the output channel layout is valid.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'
Michael Niedermayer [Wed, 1 May 2013 08:11:01 +0000 (10:11 +0200)]
Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'

* commit '949c603ed9210df0e1b8e1aa82c71b93543d8071':
  af_channelmap: remove now unnecessary goto
  vf_split: fix description

Conflicts:
libavfilter/split.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'e036bb7899d0faca9159206be9bf5552e76e7633'
Michael Niedermayer [Wed, 1 May 2013 07:59:57 +0000 (09:59 +0200)]
Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633'

* commit 'e036bb7899d0faca9159206be9bf5552e76e7633':
  lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
  FATE: add an additional indeo3 test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'
Michael Niedermayer [Wed, 1 May 2013 07:51:37 +0000 (09:51 +0200)]
Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'

* commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61':
  indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()

Conflicts:
libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '95220be1faac628d849a004644c0d102df0aa98b'
Michael Niedermayer [Wed, 1 May 2013 07:45:04 +0000 (09:45 +0200)]
Merge commit '95220be1faac628d849a004644c0d102df0aa98b'

* commit '95220be1faac628d849a004644c0d102df0aa98b':
  indeo3: fix off by one in MV validity check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/filters: fix scale example equivalence.
Clément Bœsch [Wed, 1 May 2013 02:46:12 +0000 (04:46 +0200)]
doc/filters: fix scale example equivalence.

scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...

11 years agodoc/filters: replace hqdn3d with smartblur in timeline section.
Clément Bœsch [Wed, 1 May 2013 02:44:23 +0000 (04:44 +0200)]
doc/filters: replace hqdn3d with smartblur in timeline section.

hqdn3d needs some adjustements before timeline support can be restored
(patch welcome).

11 years agoh264: Use the correct croping values.
Michael Niedermayer [Tue, 30 Apr 2013 21:51:30 +0000 (23:51 +0200)]
h264: Use the correct croping values.

This fixes returning pictures with corrupted data pointers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoh264: assert that croping values at slice level are consistent
Michael Niedermayer [Tue, 30 Apr 2013 21:49:56 +0000 (23:49 +0200)]
h264: assert that croping values at slice level are consistent

These values where checked before already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoh264_ps: check croping values
Michael Niedermayer [Tue, 30 Apr 2013 21:48:53 +0000 (23:48 +0200)]
h264_ps: check croping values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoavutil/log: Fix context pointer used for get_category()
Michael Niedermayer [Tue, 30 Apr 2013 18:05:31 +0000 (20:05 +0200)]
avutil/log: Fix context pointer used for get_category()

Fixes calling a random pointer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agogif: Fix little endian specific code
Michael Niedermayer [Tue, 30 Apr 2013 11:13:40 +0000 (13:13 +0200)]
gif: Fix little endian specific code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoframecrcenc: workaround design flaw in sidedata palette
Michael Niedermayer [Tue, 30 Apr 2013 09:44:13 +0000 (11:44 +0200)]
framecrcenc: workaround design flaw in sidedata palette

This should be reverted once palettes are dealt with in a endian independant way
in packets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: add test for separatefields filter
Paul B Mahol [Tue, 30 Apr 2013 10:22:16 +0000 (10:22 +0000)]
fate: add test for separatefields filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agofate: add test for swapuv filter
Paul B Mahol [Tue, 30 Apr 2013 10:18:45 +0000 (10:18 +0000)]
fate: add test for swapuv filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agofate: add test for telecine filter
Paul B Mahol [Tue, 30 Apr 2013 10:08:42 +0000 (10:08 +0000)]
fate: add test for telecine filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agolavfi: add trim and atrim filters.
Anton Khirnov [Tue, 2 Apr 2013 17:30:11 +0000 (19:30 +0200)]
lavfi: add trim and atrim filters.

11 years agolavfi: add an asetpts filter
Anton Khirnov [Wed, 10 Apr 2013 14:28:38 +0000 (16:28 +0200)]
lavfi: add an asetpts filter

11 years agovf_setpts: cosmetics, reformat
Anton Khirnov [Wed, 10 Apr 2013 14:13:50 +0000 (16:13 +0200)]
vf_setpts: cosmetics, reformat

11 years agographparser: only print filter arguments if they are non-NULL
Anton Khirnov [Wed, 10 Apr 2013 10:44:13 +0000 (12:44 +0200)]
graphparser: only print filter arguments if they are non-NULL

11 years agoaf_channelmap: ensure the output channel layout is valid.
Anton Khirnov [Wed, 10 Apr 2013 10:40:04 +0000 (12:40 +0200)]
af_channelmap: ensure the output channel layout is valid.

11 years agoaf_channelmap: remove now unnecessary goto
Anton Khirnov [Wed, 10 Apr 2013 10:28:51 +0000 (12:28 +0200)]
af_channelmap: remove now unnecessary goto

Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.

11 years agovf_split: fix description
Anton Khirnov [Tue, 9 Apr 2013 20:09:20 +0000 (22:09 +0200)]
vf_split: fix description

It now allows an arbitrary number of inputs, not just two.

11 years agolavc: clear AVBuffers on decoded frames if refcounted_frames is not set
Anton Khirnov [Wed, 24 Apr 2013 08:19:54 +0000 (10:19 +0200)]
lavc: clear AVBuffers on decoded frames if refcounted_frames is not set

Otherwise some code might mistakenly think it is allowed to unref those
buffers, which would lead to double unref.

11 years agolavfi/stereo3d: add support for alternating frames input & output format
Paul B Mahol [Fri, 26 Apr 2013 13:17:03 +0000 (13:17 +0000)]
lavfi/stereo3d: add support for alternating frames input & output format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoindeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
Anton Khirnov [Sat, 27 Apr 2013 18:29:09 +0000 (20:29 +0200)]
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()

They are the same in this case, except put_pixels also has blocksizes
smaller than 8.

11 years agoindeo3: fix off by one in MV validity check
Anton Khirnov [Sat, 27 Apr 2013 16:01:51 +0000 (18:01 +0200)]
indeo3: fix off by one in MV validity check

CC:libav-stable@libav.org

11 years agoFATE: add an additional indeo3 test
Anton Khirnov [Sat, 27 Apr 2013 18:54:55 +0000 (20:54 +0200)]
FATE: add an additional indeo3 test

It is a part of the sample that got broken by recent indeo3 changes.

11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 30 Apr 2013 06:42:04 +0000 (08:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Remove a set of pointless #ifs around function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295'
Michael Niedermayer [Tue, 30 Apr 2013 06:25:18 +0000 (08:25 +0200)]
Merge commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295'

* commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295':
  x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: remove forgotten transpose filter results from old system.
Clément Bœsch [Tue, 30 Apr 2013 00:11:03 +0000 (02:11 +0200)]
fate: remove forgotten transpose filter results from old system.

11 years agofate: port remaining filters to new system.
Clément Bœsch [Tue, 30 Apr 2013 00:08:48 +0000 (02:08 +0200)]
fate: port remaining filters to new system.

Merge of b963f021b603509b5159873de4919dec441d0782 is now complete.

11 years agofate: move kerndeint test to the new system.
Clément Bœsch [Mon, 29 Apr 2013 23:45:08 +0000 (01:45 +0200)]
fate: move kerndeint test to the new system.

11 years agofate: port our pixfmts change to fate-run.sh.
Clément Bœsch [Mon, 29 Apr 2013 23:32:49 +0000 (01:32 +0200)]
fate: port our pixfmts change to fate-run.sh.

This patch is the same as 52b23cbf1c8f276136556c9e2252184b763ae1ec.

11 years agofate: add a rule for pixfmts tests.
Clément Bœsch [Mon, 29 Apr 2013 23:47:42 +0000 (01:47 +0200)]
fate: add a rule for pixfmts tests.

11 years agox86: dsputil: Remove a set of pointless #ifs around function declarations
Diego Biurrun [Wed, 10 Apr 2013 23:31:51 +0000 (01:31 +0200)]
x86: dsputil: Remove a set of pointless #ifs around function declarations

11 years agox86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
Diego Biurrun [Sun, 28 Apr 2013 00:05:58 +0000 (02:05 +0200)]
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations

11 years agofate: fix filtfmts-test dependency after 9a5924f.
Clément Bœsch [Mon, 29 Apr 2013 23:19:24 +0000 (01:19 +0200)]
fate: fix filtfmts-test dependency after 9a5924f.

11 years agolavfi: add two opencl headers to SKIPHEADERS.
Clément Bœsch [Mon, 29 Apr 2013 22:32:04 +0000 (00:32 +0200)]
lavfi: add two opencl headers to SKIPHEADERS.

Fix make checkheaders.

11 years agofate: add bitexact flags to alphaextract/alphamerge tests.
Clément Bœsch [Mon, 29 Apr 2013 20:27:22 +0000 (22:27 +0200)]
fate: add bitexact flags to alphaextract/alphamerge tests.

Should fix a FATE failure.

11 years agofate: add filters dependencies to pixfmts tests.
Clément Bœsch [Mon, 29 Apr 2013 20:19:12 +0000 (22:19 +0200)]
fate: add filters dependencies to pixfmts tests.

11 years agofate: move a few simple pixfmts tests to the new system.
Clément Bœsch [Mon, 29 Apr 2013 20:05:57 +0000 (22:05 +0200)]
fate: move a few simple pixfmts tests to the new system.

11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 29 Apr 2013 20:01:47 +0000 (22:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpeldsp: Remove unused macro definitions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: move lavd filters tests to the new system.
Clément Bœsch [Mon, 29 Apr 2013 19:34:02 +0000 (21:34 +0200)]
fate: move lavd filters tests to the new system.

Also make life test a bit more useful.

11 years agofate: remove '#' in filter parameters.
Clément Bœsch [Mon, 29 Apr 2013 19:43:32 +0000 (21:43 +0200)]
fate: remove '#' in filter parameters.

It was considered a comment.

11 years agolavfi/showwaves: fix crash in case of negative linesize
Paul B Mahol [Mon, 29 Apr 2013 13:36:59 +0000 (13:36 +0000)]
lavfi/showwaves: fix crash in case of negative linesize

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agolavfi/showspectrum: fix crash in case of negative linesize
Paul B Mahol [Mon, 29 Apr 2013 13:31:04 +0000 (13:31 +0000)]
lavfi/showspectrum: fix crash in case of negative linesize

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agofate: move alphaextract and alphamerge tests to the new system.
Clément Bœsch [Mon, 29 Apr 2013 18:59:52 +0000 (20:59 +0200)]
fate: move alphaextract and alphamerge tests to the new system.

The standalone alphaextract tests are removed since already the filters
are already tested by the alphamerge tests.

11 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 29 Apr 2013 18:25:18 +0000 (20:25 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Recognize j2k as file suffix for the image2 muxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: move colormatrix tests to the new system.
Clément Bœsch [Mon, 29 Apr 2013 18:11:08 +0000 (20:11 +0200)]
fate: move colormatrix tests to the new system.

11 years agofate: restore our settings for drawtext/fade/unsharp.
Clément Bœsch [Mon, 29 Apr 2013 17:52:23 +0000 (19:52 +0200)]
fate: restore our settings for drawtext/fade/unsharp.

11 years agofate: move more tests from lavfi-regression.sh to filter-video.mak.
Clément Bœsch [Mon, 29 Apr 2013 17:17:41 +0000 (19:17 +0200)]
fate: move more tests from lavfi-regression.sh to filter-video.mak.

11 years agox86: hpeldsp: Remove unused macro definitions
Diego Biurrun [Tue, 23 Apr 2013 14:26:02 +0000 (16:26 +0200)]
x86: hpeldsp: Remove unused macro definitions

11 years agoRecognize j2k as file suffix for the image2 muxer.
Carl Eugen Hoyos [Mon, 29 Apr 2013 11:11:32 +0000 (13:11 +0200)]
Recognize j2k as file suffix for the image2 muxer.

11 years agoavfilter/vf_tinterlace: fix handling of not so even sizes
Michael Niedermayer [Mon, 29 Apr 2013 10:26:15 +0000 (12:26 +0200)]
avfilter/vf_tinterlace: fix handling of not so even sizes

Fixes green bottom line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agocopy_packet_data: fix memleak
Michael Niedermayer [Mon, 29 Apr 2013 01:08:50 +0000 (03:08 +0200)]
copy_packet_data: fix memleak

This should fix gif fate memleaks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavu/opencl: add check version and platform
highgod0401 [Sun, 28 Apr 2013 03:03:24 +0000 (11:03 +0800)]
lavu/opencl: add check version and platform

Reviewed-by: Hanspeter Niederstrasser <niederstrasser@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosws: fix typo in xyz2rgb matrix use.
Michael Niedermayer [Sun, 28 Apr 2013 17:57:45 +0000 (19:57 +0200)]
sws: fix typo in xyz2rgb matrix use.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: re-enable jpeg2000 test with rgb48le
Michael Niedermayer [Sun, 28 Apr 2013 17:31:52 +0000 (19:31 +0200)]
fate: re-enable jpeg2000 test with rgb48le

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosws: Check for malloc failure of rgb0_tmp
Michael Niedermayer [Sun, 28 Apr 2013 17:31:16 +0000 (19:31 +0200)]
sws: Check for malloc failure of rgb0_tmp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosws: support xyz input
Michael Niedermayer [Sun, 28 Apr 2013 17:28:42 +0000 (19:28 +0200)]
sws: support xyz input

The implementation is heavily based on Matthias Buerchers and Nicolas Bertrands vf_xyz2rgb.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosws: remove hack to support partial convert / xyz bswaping
Michael Niedermayer [Sun, 28 Apr 2013 17:20:06 +0000 (19:20 +0200)]
sws: remove hack to support partial convert / xyz bswaping

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: temporary disable jpeg2000 test to avoid fate breakage from next commits
Michael Niedermayer [Sun, 28 Apr 2013 17:19:03 +0000 (19:19 +0200)]
fate: temporary disable jpeg2000 test to avoid fate breakage from next commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: fix jpeg2000 on big endian
Michael Niedermayer [Sun, 28 Apr 2013 13:54:02 +0000 (15:54 +0200)]
fate: fix jpeg2000 on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosws: enable xyz12, this for now is just for swaping between le and be
Michael Niedermayer [Sun, 28 Apr 2013 13:53:20 +0000 (15:53 +0200)]
sws: enable xyz12, this for now is just for swaping between le and be

Needed for fixing fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosws: add 16bit gbrp formats to packed_16bpc_bswap()
Michael Niedermayer [Sun, 28 Apr 2013 13:35:04 +0000 (15:35 +0200)]
sws: add 16bit gbrp formats to packed_16bpc_bswap()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosws: extend packed_16bpc_bswap code to handle planar formats
Michael Niedermayer [Sun, 28 Apr 2013 13:28:00 +0000 (15:28 +0200)]
sws: extend packed_16bpc_bswap code to handle planar formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 28 Apr 2013 11:45:29 +0000 (13:45 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: check the maximum number of channels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '1b6f84a98665a15130e969fd6b460a05d50090c1'
Michael Niedermayer [Sun, 28 Apr 2013 11:39:22 +0000 (13:39 +0200)]
Merge commit '1b6f84a98665a15130e969fd6b460a05d50090c1'

* commit '1b6f84a98665a15130e969fd6b460a05d50090c1':
  h264_refs: Do not print check_opcodes() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'b963f021b603509b5159873de4919dec441d0782'
Michael Niedermayer [Sun, 28 Apr 2013 11:34:23 +0000 (13:34 +0200)]
Merge commit 'b963f021b603509b5159873de4919dec441d0782'

* commit 'b963f021b603509b5159873de4919dec441d0782':
  fate: Invoke pixfmts lavfi tests through fate-run.sh

Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi/mp: remove mp=tinterlace wrapper
Stefano Sabatini [Sun, 28 Apr 2013 11:13:26 +0000 (13:13 +0200)]
lavfi/mp: remove mp=tinterlace wrapper

From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.

See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200

11 years agolavfi/transpose: apply grammar consistency fixes to transpose dir option
Stefano Sabatini [Sat, 27 Apr 2013 18:38:32 +0000 (20:38 +0200)]
lavfi/transpose: apply grammar consistency fixes to transpose dir option

11 years agodoc/filters: apply various general fixes to vidstabdetect docs
Stefano Sabatini [Thu, 25 Apr 2013 09:59:25 +0000 (11:59 +0200)]
doc/filters: apply various general fixes to vidstabdetect docs

Adopt generally used conventions, extend and clarify explanations.

11 years agoMerge commit '28663511c99b3cdaf9387a15032259879474f5f4'
Michael Niedermayer [Sun, 28 Apr 2013 10:45:31 +0000 (12:45 +0200)]
Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'

* commit '28663511c99b3cdaf9387a15032259879474f5f4':
  fate: Invoke pixdesc lavfi tests through fate-run.sh

Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-pixdesc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'
Michael Niedermayer [Sun, 28 Apr 2013 10:29:06 +0000 (12:29 +0200)]
Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'

* commit '03b052c023e1f58d879cb7eeb6421ed39262d39d':
  fate: Invoke standard lavfi tests through fate-run.sh

Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'c14010541035454b4d3ad08399d70423be4e0c87'
Michael Niedermayer [Sun, 28 Apr 2013 10:18:18 +0000 (12:18 +0200)]
Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'

* commit 'c14010541035454b4d3ad08399d70423be4e0c87':
  oma: K&R formatting cosmetics

Conflicts:
libavformat/omadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '26a44143efb513a602542fb59aee87b1fc62af51'
Michael Niedermayer [Sun, 28 Apr 2013 10:03:41 +0000 (12:03 +0200)]
Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

* commit '26a44143efb513a602542fb59aee87b1fc62af51':
  avplay: remove a warning

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'cf679b9476727a237c8006c685ace18acba149ab'
Michael Niedermayer [Sun, 28 Apr 2013 09:48:40 +0000 (11:48 +0200)]
Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'

* commit 'cf679b9476727a237c8006c685ace18acba149ab':
  hls, segment: fix splitting for audio-only streams.

Conflicts:
libavformat/hlsenc.c
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoavformat: Add black ops audio demuxer
Michael Niedermayer [Mon, 22 Apr 2013 21:39:46 +0000 (23:39 +0200)]
avformat: Add black ops audio demuxer

Fixes Ticket2064

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoaac: check the maximum number of channels
Luca Barbato [Sat, 27 Apr 2013 16:20:47 +0000 (18:20 +0200)]
aac: check the maximum number of channels

Broken bitstreams could report a larger than specified number of
channels and cause outbound writes.

CC:libav-stable@libav.org

11 years agoffv1enc: favor version 3 over 2 unless -strict -2 is set
Michael Niedermayer [Sat, 27 Apr 2013 17:43:55 +0000 (19:43 +0200)]
ffv1enc: favor version 3 over 2 unless -strict -2 is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavu/mem: remove redundant comment from av_dynarray_add()
Stefano Sabatini [Wed, 24 Apr 2013 21:52:39 +0000 (23:52 +0200)]
lavu/mem: remove redundant comment from av_dynarray_add()

The function is documented in mem.h.

11 years agodoc/filters: update/extend transpose filter documentation
Stefano Sabatini [Sat, 27 Apr 2013 17:35:52 +0000 (19:35 +0200)]
doc/filters: update/extend transpose filter documentation

In particular, deprecate numerical values for the dir option.

11 years agolavfi/transpose: reindent constants
Stefano Sabatini [Sat, 27 Apr 2013 17:30:19 +0000 (19:30 +0200)]
lavfi/transpose: reindent constants

11 years agolavfi/transpose: restore validity of values in range 4-7
Stefano Sabatini [Sat, 27 Apr 2013 17:28:36 +0000 (19:28 +0200)]
lavfi/transpose: restore validity of values in range 4-7

They were lost in commit a4e0defa75b6f766aa31d80c55688d036b5fd87b.

11 years agoh264_refs: Do not print check_opcodes() return value
Diego Biurrun [Sat, 27 Apr 2013 16:49:54 +0000 (18:49 +0200)]
h264_refs: Do not print check_opcodes() return value

The return value provides no useful information and removing the printing
avoids the following warning:
libavcodec/h264_refs.c:788:15: warning: 'i' may be used uninitialized in this function [-Wuninitialized]

11 years agodoc/filters: readjust w/h option descriptions
Stefano Sabatini [Fri, 26 Apr 2013 18:12:21 +0000 (20:12 +0200)]
doc/filters: readjust w/h option descriptions

11 years agodoc/filters: fix grammar for removelogo filter doc sentence
Stefano Sabatini [Fri, 26 Apr 2013 18:11:41 +0000 (20:11 +0200)]
doc/filters: fix grammar for removelogo filter doc sentence

11 years agofate: Invoke pixfmts lavfi tests through fate-run.sh
Diego Biurrun [Mon, 15 Apr 2013 23:42:38 +0000 (01:42 +0200)]
fate: Invoke pixfmts lavfi tests through fate-run.sh

11 years agofate: Invoke pixdesc lavfi tests through fate-run.sh
Diego Biurrun [Mon, 15 Apr 2013 22:15:15 +0000 (00:15 +0200)]
fate: Invoke pixdesc lavfi tests through fate-run.sh

11 years agofate: Invoke standard lavfi tests through fate-run.sh
Diego Biurrun [Mon, 15 Apr 2013 21:39:08 +0000 (23:39 +0200)]
fate: Invoke standard lavfi tests through fate-run.sh

11 years agoffv1dec: remove redundant error message.
Michael Niedermayer [Sat, 27 Apr 2013 14:36:05 +0000 (16:36 +0200)]
ffv1dec: remove redundant error message.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffv1dec: add code to support frame threading with gop=1 ffv1
Michael Niedermayer [Sat, 27 Apr 2013 14:15:33 +0000 (16:15 +0200)]
ffv1dec: add code to support frame threading with gop=1 ffv1

CODEC_CAP_FRAME_THREADS is not added yet because that would
unconditionally enable it, breaking gop>1 files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffv1: Store a flag in the global header that indicates if all frames are keyframes
Michael Niedermayer [Sat, 27 Apr 2013 14:04:25 +0000 (16:04 +0200)]
ffv1: Store a flag in the global header that indicates if all frames are keyframes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoastats filter
Paul B Mahol [Mon, 22 Apr 2013 12:38:24 +0000 (12:38 +0000)]
astats filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>