virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
78,802 Commits 37 Branches 400 Tags 463 MiB
a11258b732
Commit Graph

78802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch
fa2df3a401 lavfi/ass: use ass_process_chunk() instead of ass_process_data() 2016-02-26 21:53:34 +01:00
Clément Bœsch
6433618dc0 ffmpeg: set sub_text_format to ass (without timing) by default 
Fixes Ticket #4783
 2016-02-26 21:53:34 +01:00
Clément Bœsch
30e7685360 lavc/options: add ass_ro_flush_noop to flags2 2016-02-26 21:53:32 +01:00
Clément Bœsch
2941282124 lavc: allow subtitle text format to be ASS without timing 2016-02-26 21:49:34 +01:00
Clément Bœsch
805685fffd Kill timed SSA 2016-02-26 21:34:33 +01:00
Michael Niedermayer
7a8ab57cf1 fate: Add test for packed mp3 in mp4 demuxing 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-26 20:12:53 +01:00
Michael Niedermayer
410f717ff6 avcodec/utils: Merge identical if conditions 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-26 20:12:30 +01:00
Rostislav Pehlivanov
bc7beb6574 vc2enc: calculate the minimum slice size only once 
This commit moves the minimum bits per slice calculations outside of the
rate control function as it is identical for every slice.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-26 15:38:26 +00:00
Rostislav Pehlivanov
2b811e4605 vc2enc: halve allocated table size, refactor and optimize quantization 
Since coefficients differ only in the last bit when writing to the
bitstream it was possible to remove the sign from the tables, thus
halving them. Also now all quantization is done in the unsigned domain
as the sign is completely separate, which gets rid of the need to do
quantization on 32 bit signed integers.

Overall, this slightly speeds up the encoder depending on the machine.
The commit still generates bit-identical files as before the commit.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-26 14:47:06 +00:00
Rostislav Pehlivanov
7db2e757c5 vc2enc: use FFABS() instead of abs() 
Provides a minor speedup.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-26 12:55:34 +00:00
Rostislav Pehlivanov
3ef10406e1 vc2enc: correctly zero out coefficient array padding 
Credit for figuring this out goes to James Darnley.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-26 12:21:36 +00:00
Rostislav Pehlivanov
35346c7b0f vc2enc: mark as FF_CODEC_CAP_INIT_THREADSAFE and align AVCodec entries 
The encoder does not modify any global variables.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-26 12:17:42 +00:00
Paul B Mahol
2a7f056d88 avfilter/af_astats: do not clear previous sample value 
Should help when using reset=1 and metadata=1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-26 11:12:45 +01:00
Stefano Sabatini
dedcb3c5a5 lavf/mux: do not fail in case of non strictly monotonically increasing DTS values for data packets 
Consistent with what we already do with subtitles since ac08c5c0ad.
 2016-02-26 10:18:09 +01:00
Carl Eugen Hoyos
07eec5e721 lavf/img2dec: Skip SOF size when probing jpeg. 
Fixes auto-detection for some resolutions.
Reported-by: Clément Bœsch
 2016-02-26 09:53:29 +01:00
Matthieu Bouron
885a6d8324 configure: only check dispatch header on darwin 
Fixes build of lavd/jack on linux if dispatch happens to be available on
this platform. dispatch, as well as its dependencies kqueue and pwq are
generally not installed / distribued on linux systems. If it happens to
be the case, you want to explicitely link against the libraries (using
-ldispatch) as opposed to darwin where it is part of the standard
library and -ldispatch doesn't work.
 2016-02-26 09:23:17 +01:00
Lou Logan
0eb0f29a40 MAINTAINERS: remove myself as a server maintainer 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-02-25 18:10:48 -09:00
Matthieu Bouron
666e2edc41 configure: add missing --strip option to show_help() 2016-02-25 21:21:39 +01:00
Carl Eugen Hoyos
0f31d401c3 lavc/mjpegdec: Fix decoding images with Adobe_CM tag. 
Fixes ticket #5267.
 2016-02-25 13:26:13 +01:00
Carl Eugen Hoyos
03af008e21 doc/filters: Fix idet option name "rep_thres". 
Reported by forum user vovcheck.
 2016-02-25 13:23:52 +01:00
Matt Oliver
7ecef5ed51 avfilter/hwupload_cuda: Add missing semicolon. 
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
 2016-02-25 15:52:01 +11:00
Neil Birkbeck
ad17b9d2d4 libavcodec:add packet level support for mastering metadata 
Some containers, like webm/mkv, will contain this mastering metadata.
This is analogous to the way 3D fpa data is handled (in frame and
packet side data).

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-25 00:18:12 +01:00
Michael Niedermayer
954f865c8e avfilter/drawutils: fix gray and gbr formats on big endian 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-25 00:07:51 +01:00
Michael Niedermayer
6bc20e84d8 avfilter/drawutils: Fix ff_fill_rectangle() on big endian 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-25 00:07:51 +01:00
Paul B Mahol
0d65a7d033 avfilter/af_astats: clear all stats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-25 00:00:25 +01:00
Paul B Mahol
c09248aecd avfilter/af_astats: reset stats prior not after filtering 
This way stats printed at uninit are also useful.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-24 22:32:26 +01:00
Michael Niedermayer
5870f2a1dc Revert "Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'" 
This broke packed_maindata.mp3.mp4
Its unknown to me what this commit would have fixed

Reviewed-by: James Almer <jamrial@gmail.com>

This reverts commit 79127dbbef, reversing
changes made to 9fad1ce7c9.
 2016-02-24 21:24:38 +01:00
James Almer
fc404460bd configure: add missing vc1dsp dependency to vc1_decoder 
Fixes compilation of vc1_decoder when vc1_parser is not enabled

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-24 15:49:51 -03:00
Paul B Mahol
b6a0aa1c0a avfilter/vf_blend: add freeze and heat modes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-24 19:30:13 +01:00
Derek Buitenhuis
2ef37691a0 Merge commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49' 
This commit is a no-op. We already do this.

* commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49':
  matroska: Always consider S_TEXT/UTF8 as SRT when demuxing

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:27:32 +00:00
Derek Buitenhuis
8ae21fd959 Merge commit '8caadfc53ddc55a269722ada65294f0ea8b609ac' 
* commit '8caadfc53ddc55a269722ada65294f0ea8b609ac':
  fate: Be silent when switching to Git branch

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:25:27 +00:00
Derek Buitenhuis
79b1a24b7d Merge commit '8d918a98aa24134a043d578ef45bae363dbed9db' 
* commit '8d918a98aa24134a043d578ef45bae363dbed9db':
  rtpdec: Use the right logging context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:24:34 +00:00
Derek Buitenhuis
ef7ce480c8 Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9' 
* commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9':
  build: Disentangle VC-1 decoder and parser

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:23:36 +00:00
Derek Buitenhuis
b056482ef3 Merge commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c' 
* commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c':
  build: Add vc1dsp component for more fine-grained dependencies

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:21:38 +00:00
Derek Buitenhuis
2814f06abf Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9' 
* commit 'f9fbd474676e903e12efe83203697d60a9d28cf9':
  msmpeg4data: Move WMV2 data tables to their own file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:15:14 +00:00
Derek Buitenhuis
133aa68601 Merge commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4' 
* commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4':
  msmpeg4data: K&R formatting cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:13:25 +00:00
Derek Buitenhuis
d61849f0b7 Merge commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac' 
* commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac':
  build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:12:26 +00:00
Derek Buitenhuis
0ffaae60e8 Merge commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba' 
* commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba':
  build: More precise dependencies for h264dsp

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:11:03 +00:00
Derek Buitenhuis
dc61014319 Merge commit 'f273f7fb25b68792be481c9241b0ec2876e41f35' 
This commit is a no-op. We already set this.

* commit 'f273f7fb25b68792be481c9241b0ec2876e41f35':
  mkv: Force the full parsing of mp3

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:08:45 +00:00
Derek Buitenhuis
79127dbbef Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0' 
* commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0':
  mov: Force the full parsing of mp3

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:06:40 +00:00
Derek Buitenhuis
9fad1ce7c9 Merge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c' 
This commit is a no-op.

We have already reverted the configure changes, and we do not have a typo
in configure.

* commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c':
  Revert all recent configure changes related to dependency resolution
  build: Fix typo in HEVC VDPAU hwaccel dependencies

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:05:29 +00:00
Derek Buitenhuis
f99195d56f Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364' 
* commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364':
  voc: Split ff_voc_get_packet into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:04:34 +00:00
Derek Buitenhuis
745d0c0300 Merge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310' 
* commit '624e235502c5aa2d17e22dd6c0ccdf080a177310':
  build: Introduce iso_media component

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:53:30 +00:00
Derek Buitenhuis
34e4c588c8 Merge commit '82454c3a826bc8aa42474097784b70befd5be532' 
* commit '82454c3a826bc8aa42474097784b70befd5be532':
  build: Let the WTV demuxer select the MPEG-TS demuxer
  build: Adjust mpeg4video parser dependencies
  build: Fix mpegvideo component dependencies
  build: Fix dependencies for components relying on H.263 data tables

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:46:10 +00:00
Derek Buitenhuis
3c5a040ad9 Merge commit 'e453129321778886813dcecf73c8b42f8352ca0e' 
* commit 'e453129321778886813dcecf73c8b42f8352ca0e':
  build: Add missing dependencies for eatqi decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:39:04 +00:00
Derek Buitenhuis
7e12a3d57c Merge commit '71eaefa64a54bece571299ca600d06f48ac7c6c3' 
* commit '71eaefa64a54bece571299ca600d06f48ac7c6c3':
  build: Add missing celp_math dependency for G723_1 encoder and decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:38:33 +00:00
Derek Buitenhuis
ca408cf557 Merge commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f' 
* commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f':
  checkasm: Use standard multiple inclusion guards

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:36:52 +00:00
Derek Buitenhuis
aaa3d62272 Merge commit '3d8025d602045cbd2894e5182d9243c2e864c8c8' 
* commit '3d8025d602045cbd2894e5182d9243c2e864c8c8':
  profiles: Add missing #endif comment

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:36:30 +00:00
Derek Buitenhuis
5eb4073781 Merge commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab' 
* commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab':
  cosmetics: Drop particularly redundant silly comments

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:35:47 +00:00
Derek Buitenhuis
1a12eb4a73 Merge commit '29c2d06d67724e994980045afa055c6c34611b30' 
* commit '29c2d06d67724e994980045afa055c6c34611b30':
  cosmetics: Drop empty comment lines

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:31:44 +00:00