Michael Niedermayer
affd5018ac
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Recognize j2k as file suffix for the image2 muxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 20:25:23 +02:00
Clément Bœsch
9a0e40ec8c
fate: move colormatrix tests to the new system.
2013-04-29 20:20:13 +02:00
Clément Bœsch
80bcbed157
fate: restore our settings for drawtext/fade/unsharp.
2013-04-29 20:00:49 +02:00
Clément Bœsch
c703f7bdbd
fate: move more tests from lavfi-regression.sh to filter-video.mak.
2013-04-29 20:00:49 +02:00
Diego Biurrun
20784aa678
x86: hpeldsp: Remove unused macro definitions
2013-04-29 15:57:00 +02:00
Carl Eugen Hoyos
00a61ac755
Recognize j2k as file suffix for the image2 muxer.
2013-04-29 13:11:32 +02:00
Michael Niedermayer
e92862e75f
avfilter/vf_tinterlace: fix handling of not so even sizes
...
Fixes green bottom line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 12:26:15 +02:00
Michael Niedermayer
b691bc424f
copy_packet_data: fix memleak
...
This should fix gif fate memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 03:08:50 +02:00
highgod0401
df9117921a
lavu/opencl: add check version and platform
...
Reviewed-by: Hanspeter Niederstrasser <niederstrasser@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 23:42:58 +02:00
Michael Niedermayer
cb23b06e5e
sws: fix typo in xyz2rgb matrix use.
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:57:45 +02:00
Michael Niedermayer
54429142c5
fate: re-enable jpeg2000 test with rgb48le
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:31:52 +02:00
Michael Niedermayer
24ec7a5e04
sws: Check for malloc failure of rgb0_tmp
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:31:16 +02:00
Michael Niedermayer
0c47c9028b
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>
2013-04-28 19:30:01 +02:00
Michael Niedermayer
45f1cf88a8
sws: remove hack to support partial convert / xyz bswaping
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:20:06 +02:00
Michael Niedermayer
42a7938cca
fate: temporary disable jpeg2000 test to avoid fate breakage from next commits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:19:03 +02:00
Michael Niedermayer
b4fc2a10df
fate: fix jpeg2000 on big endian
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 15:54:02 +02:00
Michael Niedermayer
2fa08abdb6
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>
2013-04-28 15:53:20 +02:00
Michael Niedermayer
7f17e0ff6a
sws: add 16bit gbrp formats to packed_16bpc_bswap()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 15:35:04 +02:00
Michael Niedermayer
f5cca47fde
sws: extend packed_16bpc_bswap code to handle planar formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 15:28:00 +02:00
Michael Niedermayer
5149407731
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aac: check the maximum number of channels
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 13:54:56 +02:00
Michael Niedermayer
65af5e815a
Merge commit '1b6f84a98665a15130e969fd6b460a05d50090c1'
...
* commit '1b6f84a98665a15130e969fd6b460a05d50090c1':
h264_refs: Do not print check_opcodes() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 13:40:47 +02:00
Michael Niedermayer
124244ec48
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>
2013-04-28 13:34:23 +02:00
Stefano Sabatini
0400176772
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
2013-04-28 13:16:40 +02:00
Stefano Sabatini
75070d9fa0
lavfi/transpose: apply grammar consistency fixes to transpose dir option
2013-04-28 13:16:40 +02:00
Stefano Sabatini
dfb3de21d8
doc/filters: apply various general fixes to vidstabdetect docs
...
Adopt generally used conventions, extend and clarify explanations.
2013-04-28 13:16:40 +02:00
Michael Niedermayer
191430a28f
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>
2013-04-28 13:00:04 +02:00
Michael Niedermayer
506ebdac2a
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>
2013-04-28 12:34:55 +02:00
Michael Niedermayer
2ac6d6b7cd
Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'
...
* commit 'c14010541035454b4d3ad08399d70423be4e0c87':
oma: K&R formatting cosmetics
Conflicts:
libavformat/omadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 12:18:18 +02:00
Michael Niedermayer
5fd254c4f6
Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'
...
* commit '26a44143efb513a602542fb59aee87b1fc62af51':
avplay: remove a warning
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 12:03:41 +02:00
Michael Niedermayer
54056c1493
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>
2013-04-28 11:48:40 +02:00
Michael Niedermayer
0fb64da63f
avformat: Add black ops audio demuxer
...
Fixes Ticket2064
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 04:21:29 +02:00
Luca Barbato
a943a132f3
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
2013-04-28 00:40:33 +02:00
Michael Niedermayer
7f138310fb
ffv1enc: favor version 3 over 2 unless -strict -2 is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 22:48:13 +02:00
Stefano Sabatini
1c1a2d1319
lavu/mem: remove redundant comment from av_dynarray_add()
...
The function is documented in mem.h.
2013-04-27 20:34:10 +02:00
Stefano Sabatini
9f3d873f5f
doc/filters: update/extend transpose filter documentation
...
In particular, deprecate numerical values for the dir option.
2013-04-27 20:34:02 +02:00
Stefano Sabatini
028c73358a
lavfi/transpose: reindent constants
2013-04-27 20:33:54 +02:00
Stefano Sabatini
d33c77b14a
lavfi/transpose: restore validity of values in range 4-7
...
They were lost in commit a4e0defa75
.
2013-04-27 20:33:48 +02:00
Diego Biurrun
1b6f84a986
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]
2013-04-27 19:13:45 +02:00
Stefano Sabatini
1e4f75debd
doc/filters: readjust w/h option descriptions
2013-04-27 18:47:51 +02:00
Stefano Sabatini
efff09418d
doc/filters: fix grammar for removelogo filter doc sentence
2013-04-27 18:47:45 +02:00
Diego Biurrun
b963f021b6
fate: Invoke pixfmts lavfi tests through fate-run.sh
2013-04-27 16:53:42 +02:00
Diego Biurrun
28663511c9
fate: Invoke pixdesc lavfi tests through fate-run.sh
2013-04-27 16:53:42 +02:00
Diego Biurrun
03b052c023
fate: Invoke standard lavfi tests through fate-run.sh
2013-04-27 16:53:42 +02:00
Michael Niedermayer
d4868a960b
ffv1dec: remove redundant error message.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 16:36:05 +02:00
Michael Niedermayer
ff0b4c08ca
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>
2013-04-27 16:20:42 +02:00
Michael Niedermayer
1a392fc550
ffv1: Store a flag in the global header that indicates if all frames are keyframes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 16:17:29 +02:00
Paul B Mahol
cc5c155959
astats filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-27 12:40:34 +00:00
Michael Niedermayer
3fa6c992d9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
Conflicts:
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 11:35:03 +02:00
Luca Barbato
c140105410
oma: K&R formatting cosmetics
2013-04-27 10:53:24 +02:00
Luca Barbato
26a44143ef
avplay: remove a warning
...
Set the data field in the flush_pkt to the pointer to the actual packet.
The field needs to contain a valid unique pointer, no read nor writes
are ever made to it.
2013-04-27 10:51:28 +02:00