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
Anton Khirnov
cf679b9476
hls, segment: fix splitting for audio-only streams.
...
CC:libav-stable@libav.org
2013-04-27 10:19:04 +02:00
Paul B Mahol
785eb5fc57
lavfi/negate: unbreak negate alpha
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 23:45:24 +00:00
Paul B Mahol
7becddd5f3
doc/filters: remove non-existent ft_load_flags entry
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 23:37:37 +00:00
Michael Niedermayer
24bb01f038
avcodec_string: Print the used codec if it differs from the codec_id name.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 00:49:14 +02:00
Michael Niedermayer
59a3b6b751
avcodec_string: remove the "(hq)" listing
...
printing "hq" depending on a single video encoding parameter makes
little sense
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 00:49:12 +02:00
Michael Niedermayer
a057552212
avutil/log: dont count&print repeats for empty strings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 23:41:29 +02:00
Michael Niedermayer
9a0aa8d02a
avcodec/intrax8: fix regression with wmv3
...
This also decreases dependancies between intrax8 and the outside
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 23:04:15 +02:00
Clément Bœsch
039c2b7828
lavfi/hqdn3d: remove timeline flag.
...
The filter stores some temporal data, which needs to be done with the
passthrough callback system when timeline is enabled. Until then,
timeline support is disabled.
2013-04-26 21:27:02 +02:00
Diego Biurrun
7c00e9d8ae
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
...
The function requires increasing the fuzz factor for the ac3/eac3 encode
tests and even so makes fate fail. It only provides a slight encoding
speedup for legacy CPUs that do not support SS2. Thus its benefit is not
worth the trouble it creates and fixing it would be a waste of time.
2013-04-26 21:06:52 +02:00
Michael Niedermayer
74b1c32a80
avutil/log: leave prefix printing state on empty input.
...
Fixes printing the prefix after an empty string was printed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 20:31:25 +02:00
Michael Niedermayer
d78329700d
vc1dec: make sure next_use_ic is set correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 15:50:32 +02:00
Michael Niedermayer
ee4c01bef6
vc1dec: factor lut clean code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 15:39:32 +02:00
Michael Niedermayer
ba323d67fa
avformat/write_packet: drop disabled code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:57:56 +02:00
Michael Niedermayer
eba33396f0
avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer
...
This changes the default to avoid negative timestamps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
e5891a2337
avformat/movenc: mov/mp4 should support negative timestamps through edit lists
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
647f306b46
avformat/mux: assert that timestamps are positive after offsetting them
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
c329195a27
avformat/mux: use a local variable for offset
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Michael Niedermayer
060f14f493
avformat/mux: change avoid_negative_ts code to support later addition of AVStreams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
Paul B Mahol
30579b7ef0
dcaenc: silence address sanitizer warning
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 11:41:00 +00:00
Paul B Mahol
6a8d05061f
lavfi/stereo3d: avoid division when changing aspect ratio
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 10:13:50 +00:00
Paul B Mahol
42d61fd968
lavfi/afade: fix AVOptions descriptions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 10:04:16 +00:00