Derek Buitenhuis
528af33b6f
Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'
...
This commit is a no-op. wm4 is working to get these into ffmpeg
proper, with ffmpeg versions of the patches.
* commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1':
lavf: use new decode API
avconv: use new encode API
avconv: use new decode API
lavc: introduce a new decoding/encoding API with decoupled input/output
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18 15:13:28 +01:00
Derek Buitenhuis
1be5509fbb
Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'
...
These commits are no-ops. Not going to merge these since our opt
tests are more complex, and have several blocks with different
options.
* commit '0d2fcdb1c5c9e844c232e5429130727121990d0e':
opt-test: Merge struct declaration and initialization
opt-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18 15:00:18 +01:00
Michael Niedermayer
ce18e48aec
avcodec/dump_extradata_bsf: Add back 'k' and 'e' options
...
broken since af9cac1be1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18 02:54:33 +02:00
Michael Niedermayer
57fc93ecb2
avcodec/remove_extradata_bsf: Add back 'k' and 'e' options
...
broken since af9cac1be1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18 02:54:27 +02:00
Michael Niedermayer
8106479503
avcodec/bitstream_filter: Fix initializing options from the argument string
...
Fixes ffmpeg ... -vbsf noise=234 ...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18 02:48:44 +02:00
Michael Niedermayer
76d0209db4
avcodec/intrax8: Remove duplicated chunk from ba5bcf9612
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18 00:59:18 +02:00
Carl Eugen Hoyos
db7d0d6e7c
lavc/fic: Cosmetics, fix a typo.
...
Found by Moritz Barsnick
2016-04-18 00:18:54 +02:00
Thilo Borgmann
37a4d3383f
lavfi/perspective: Add basic timeline editing.
...
Add number of input and output frames to possible variables.
Add option eval to reevaluate coordinate expressions during
initialization or for every frame.
2016-04-17 21:12:34 +02:00
Derek Buitenhuis
d97a61a8f1
Merge commit 'a84713e70d06238100cb0f867ad6031c272054b0'
...
This commit is a no-op.
* commit 'a84713e70d06238100cb0f867ad6031c272054b0':
parseutils-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:46:01 +01:00
Carl Eugen Hoyos
1106a2c5dd
lavc/webp: Print a warning for unsupported chunks.
2016-04-17 20:42:10 +02:00
Derek Buitenhuis
4b23a8137f
Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'
...
* commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7':
des-test: Move a variable declaration to avoid an ifdef
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:40:53 +01:00
Derek Buitenhuis
8f540b8612
Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'
...
* commit '65a802401c6cc136576bb2e613c0577cbf622aa8':
build: Add component for the SRTP common code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:39:57 +01:00
Derek Buitenhuis
9b36f446ac
Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'
...
* commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4':
timefilter-test: Only compile timefilter-test if JACK is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:37:54 +01:00
Derek Buitenhuis
b0c75963c8
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'
...
* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7':
doc: Update paths to match new examples location
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:36:59 +01:00
Derek Buitenhuis
9d4799c247
Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'
...
* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a':
Move const qualifier before type name
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:35:03 +01:00
Derek Buitenhuis
61400a1dc7
Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'
...
* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59':
vc1dec: wmv2dec: Validate ff_intrax8_common_init return value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:32:26 +01:00
Derek Buitenhuis
f64b53f2bf
Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'
...
* commit '0372e73f917e72c40b09270f771046fc142be4a7':
intrax8: Check and propagate errors from ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:31:32 +01:00
Derek Buitenhuis
c29ac4abb8
Merge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'
...
* commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345':
intrax8: Move documentation from implementation to header file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:30:01 +01:00
Derek Buitenhuis
ba5bcf9612
Merge commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950'
...
* commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950':
intrax8: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:27:53 +01:00
Derek Buitenhuis
7120bff0a3
Merge commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13'
...
* commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13':
intrax8: Adjust printf conversion specifier for sizeof expression
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:13:30 +01:00
Derek Buitenhuis
2c3e38f44f
Merge commit '42244ce07a1f4f5108ae86d50fe72db785d483ed'
...
* commit '42244ce07a1f4f5108ae86d50fe72db785d483ed':
intrax8: Move a comment to the place it corresponds
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:11:43 +01:00
Derek Buitenhuis
e445b80c74
Merge commit '750562549ceef268b29b94f6a887d9cf331a8c78'
...
* commit '750562549ceef268b29b94f6a887d9cf331a8c78':
intrax8: Wrap multiline macros in do{}while(0) clauses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:11:17 +01:00
Derek Buitenhuis
909f5e7100
Merge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'
...
* commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4':
intrax8: Move error resilience out of intrax8
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:09:12 +01:00
Derek Buitenhuis
dff9894acd
Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'
...
* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc':
nuv: Use the correct context for av_image_check_size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:06:18 +01:00
Derek Buitenhuis
d9357332ae
Merge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'
...
* commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a':
indeo4: Consistently initialize variables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 18:53:11 +01:00
Derek Buitenhuis
1117d6f4b1
Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'
...
* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721':
indeo4: Rework stream analysis report
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 18:51:58 +01:00
Derek Buitenhuis
98e3153fa3
Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'
...
This commit is a no-op. We will do this when we convert ffmpeg.c
* commit '4426540f0c3ee516662f79d0a6ab5b95503b6611':
avconv: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 18:50:11 +01:00
Derek Buitenhuis
af9cac1be1
Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'
...
* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
lavc: add a new bitstream filtering API
Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 18:47:40 +01:00
Michael Niedermayer
6d160afab2
avfilter/vf_readvitc: Use avpriv_frame_get_metadatap() avoid direct access to AVFrame.metadata (to comply to API)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-17 18:21:42 +02:00
Ronald S. Bultje
ee729cc0ed
vp9: ignore frame_context_index field in key-/intraonly-frames.
...
Reproduces a bug to remain consistent with libvpx' behaviour.
2016-04-17 09:28:56 -04:00
Ronald S. Bultje
6135aed0d2
vf_scale: support bt2020 in in/out_color_matrix properties.
2016-04-17 09:28:30 -04:00
Michael Niedermayer
c8d95e5ceb
avfilter/colorspacedsp_template: Add argument protecting () to avg()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-17 13:17:18 +02:00
Paul B Mahol
7a0aee1688
avcodec/takdec: fix decoding of some sample rates with multichannel coder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-17 11:30:56 +02:00
Ivan
3a727606c4
avcodec/h264: Fix for H.264 configuration parsing
...
Sometimes video fails to decode if H.264 configuration changes mid stream.
The reason is that configuration parser assumes that nal_ref_idc is equal to 11b
while actually some codecs but 01b there. The H.264 spec is somewhat
vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-17 02:39:36 +02:00
James Almer
b63ba3a517
avformat/hashenc: add missing avio_flush to hash_write_trailer
...
It was accidentally deleted in the previous hashenc commit
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-16 21:31:58 -03:00
Michael Niedermayer
487c346d98
avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-17 01:52:26 +02:00
Michael Niedermayer
618032da0d
fate: add test for Ticket4816 (PNG decoding with alpha)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-17 01:16:19 +02:00
Rostislav Pehlivanov
9e138c4813
vc2enc: use 32x16 slices by default
...
Approximately 1.25 times faster than 64x32, visually and
statistically improves quality.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2016-04-16 23:59:36 +01:00
Rostislav Pehlivanov
77fb7177af
vc2enc: don't require interlacing for 1080p50/60 base video formats
...
Typo
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2016-04-16 23:59:36 +01:00
Tobias Rapp
2aad631a81
avfilter: add readvitc filter
...
Add a filter to scan the top lines of video frames for vertical interval
timecode (VITC) information and attach it as metadata keys.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2016-04-16 16:22:43 +02:00
Michael Niedermayer
60517c3ad6
avfilter/af_hdcd: Fix informations typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-16 02:01:10 +02:00
Michael Niedermayer
c4fad02779
avformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is available again
...
Reminded-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-16 02:01:10 +02:00
Carl Eugen Hoyos
a676c29af5
lavf/bink: Cosmetics: Reindent after last commit.
2016-04-15 21:26:04 +02:00
Carl Eugen Hoyos
6d39132fd4
lavf/bink: Support Monkey Island 4 (SMUSH) files.
...
Fixes ticket #5410 .
2016-04-15 21:22:10 +02:00
Carl Eugen Hoyos
139cbeb75e
lavc/dds: Fix GRAY8A decoding.
...
Fixes ticket #4667 .
2016-04-15 21:06:34 +02:00
Michael Niedermayer
f07923253a
avcodec/avcodec: Document signed/unsignedness of sample formats in relation to bits_per_raw_sample
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 17:58:05 +02:00
Michael Niedermayer
bcf936eaea
avcodec/utils: Add braces to framecount computation
...
Suggestes-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 15:48:02 +02:00
Michael Niedermayer
a7fa1e38ca
avcodec/utils: Fix duration of ATRAC3 packets
...
Fixes ticket1680
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 15:03:27 +02:00
Benjamin Steffes
0cfe16437f
lavfi/af_hdcd: Implement high definition audio cd filtering.
...
Fixes ticket #4441 .
2016-04-15 12:14:55 +02:00
James Almer
bb505cd505
avformat/hashenc: simplify hash_write_trailer
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-14 20:59:08 -03:00