virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity
75,831 Commits 38 Branches 406 Tags
35c3043ea4e67f07ada1e45aaf7b5af2c88c352c
Commit Graph

75831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DeHackEd
e06114fed3 libx264: copy A53 closed captions from source 
Assumes 'GA94' format (ATSC standard)

Signed-off-by: DHE <git@dehacked.net>
Tested-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 23:39:01 +02:00
Christophe Gisquet
f827a17005 blockdsp: reindent after parameter removal 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 23:34:56 +02:00
Ganesh Ajjanagadde
c4c389aa14 avcodec/apedec: fix bug introduced in commit d3e5fbb140 
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 23:04:23 +02:00
Carl Eugen Hoyos
32a6d37a6b lavf/mlpdec: Simplify mlp/thd probe function. 
Move the demuxers into their own file.
 2015-10-03 22:40:27 +02:00
Paul B Mahol
e306e43633 avfilter/vf_stereo3d: rewrite in preparation for SIMD 
Also slightly faster.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-10-03 22:25:54 +02:00
Ganesh Ajjanagadde
8d1226e623 configure: silence preprocessor noise from dependency generation 
Currently, errors are thrown for various macros while building that are completely bogus.
They occur during the dependency (.d) generation phase, and have no bearing on the compiled output,
since only the stdout is piped into the sed command to generate the .d files.
They basically occur as the relevant -I paths are not (and cannot be passed) during
the dependancy generation phase.
As such, this patch silences them.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 21:59:24 +02:00
Michael Niedermayer
fd9a528523 avfilter/vf_blend: Fix argument types, fix segfault in asm 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 21:59:24 +02:00
Carl Eugen Hoyos
d89820002a lavf/shortendec: Autodetect raw Shorten streams. 
Move the demuxer into its own file.
 2015-10-03 21:48:16 +02:00
Paul B Mahol
9762554dd0 avfilter/vf_blend: add x86 SIMD for some modes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-10-03 21:26:17 +02:00
Ronald S. Bultje
061b67fb50 vp9: 10/12bpp SIMD (sse2/ssse3/avx) for directional intra prediction. 2015-10-03 14:42:39 -04:00
Ronald S. Bultje
26ece7a511 vp9: 16bpp tm/dc/h/v intra pred simd (mostly sse2) functions. 2015-10-03 14:42:39 -04:00
Ronald S. Bultje
db7786e8ff vp9: sse2/ssse3/avx 16bpp loopfilter x86 simd. 2015-10-03 14:42:39 -04:00
Ganesh Ajjanagadde
254c64c574 cmdutils: silence unused warnings under --disable-swscale, --disable-swresample 
This patch silences such warnings by placing initializations under a header guard,
see e.g
http://fate.ffmpeg.org/log.cgi?time=20150919095430&log=compile&slot=x86_64-archlinux-gcc-disableswscale,
http://fate.ffmpeg.org/log.cgi?time=20150919095048&log=compile&slot=x86_64-archlinux-gcc-disableswresample
for examples of such warnings.
It also has the benefit of placing library specific #defines next to each other.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-10-03 19:26:09 +02:00
Ganesh Ajjanagadde
8dc6e92c3d ffplay: more robust mutex, condition variable handling 
SDL_CreateMutex and SDL_CreateCond can fail:
https://wiki.libsdl.org/SDL_CreateMutex.
This patch makes handling more robust in one instance.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-10-03 17:43:24 +02:00
Carl Eugen Hoyos
64508b9af2 configure: Remove --disable-avutil which has no effect from help output. 2015-10-03 16:35:32 +02:00
Carl Eugen Hoyos
7c94cfa262 lavc/options_table: Add option flags to the truncated flag. 
Also add a short description for the help output.
 2015-10-03 16:34:03 +02:00
Paul B Mahol
13090895cf avfilter/vf_tinterlace: add mergex2 mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-10-03 15:22:16 +02:00
Henrik Gramner
99982524f9 checkasm: Remove use of deprecated av_set_cpu_flags_mask() 2015-10-03 15:08:24 +02:00
Michael Niedermayer
de2f531699 configure: Change screenpresso_decoder to select zlib instead of dep 
zlib is used as a suggest/select target not a dep

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 14:42:02 +02:00
Ganesh Ajjanagadde
0493e42eb2 avcodec/x86/hpeldsp_rnd_template: silence -Wunused-function on --disable-mmx 
This silences some of the -Wunused-function warnings when compiled with --disable-mmx, e.g
http://fate.ffmpeg.org/log.cgi?time=20150919094617&log=compile&slot=x86_64-archlinux-gcc-disable-mmx.
Header guards are too brittle and ugly for this case.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 14:24:41 +02:00
Anton Khirnov
bb198c4997 d3d11va: make av_d3d11va_alloc_context() available at all times 
The public API should not depend on the build configuration.
 2015-10-03 14:09:23 +02:00
Anton Khirnov
f320287159 d3d11va: check for malloc failure 2015-10-03 14:08:13 +02:00
Henrik Gramner
2c3dbff1d8 avutil/avstring: Inline some tiny functions 
They're short enough that inlining them actually reduces code size due to
all the overhead associated with making a function call.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-10-03 13:45:37 +02:00
John Stebbins
f56a085593 matroskaenc: Don't write a track language tag 
"language" is not an offical matroska tag.
Track languages are specified with the MATROSKA_ID_TRACKLANGUAGE ebml.
Writing the tag overrides the ebml specified language during playback with
libav and some other players.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-10-03 13:44:35 +02:00
Henrik Gramner
8bb376cf6b checkasm: Fix the function name sorting algorithm 
The previous implementation was behaving incorrectly in some corner cases.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-10-03 13:38:03 +02:00
Rodger Combs
14221b2dd9 lavf/hls: allow subtitles to be read despite incomplete handling 
This will give incorrect results in some cases due to not parsing segments
separately, so it currently requires -strict experimental.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 12:54:44 +02:00
Hendrik Leppkes
6b849211bc Merge commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333' 
* commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333':
  dnxhddata: Deduplicate cid 1256 chroma table

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:49:22 +02:00
Hendrik Leppkes
6411ac6886 Merge commit '1fb63d6f43c348e9c990fa6f7c1bd43f22bc2389' 
* commit '1fb63d6f43c348e9c990fa6f7c1bd43f22bc2389':
  dnxhddata: Deduplicate dnx100 tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:48:41 +02:00
Hendrik Leppkes
092d22ea75 Merge commit 'cc320296ab438dfe3178f0e1f775af955fe6c064' 
* commit 'cc320296ab438dfe3178f0e1f775af955fe6c064':
  dnxhddata: Fix cid 1260 luma and chroma tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:47:35 +02:00
Hendrik Leppkes
ed11e8966c Merge commit 'bfe1cd80ebeab58cbc1c91ac766a96fce8e4ec1e' 
* commit 'bfe1cd80ebeab58cbc1c91ac766a96fce8e4ec1e':
  dnxhddata: Fix 10-bit DNxHD quant matrices

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:47:20 +02:00
Hendrik Leppkes
cda503a1b9 Merge commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8' 
* commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8':
  x264: Add option to force IDR frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:46:01 +02:00
Hendrik Leppkes
f5af92edb9 Merge commit 'eb02387add350f2b34a3e61539fe25ec6213eb18' 
* commit 'eb02387add350f2b34a3e61539fe25ec6213eb18':
  x264: Expose the NV21 input support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:43:46 +02:00
Hendrik Leppkes
4e67382d72 Merge commit '74942685cb457c01937686892878403a409baf27' 
* commit '74942685cb457c01937686892878403a409baf27':
  hls: Check av_opt_set_dict return value as well

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:43:28 +02:00
Hendrik Leppkes
a11741c293 Merge commit 'd0a3e89d41b05f9ed0e7401c352b60ed4f4d1ed5' 
* commit 'd0a3e89d41b05f9ed0e7401c352b60ed4f4d1ed5':
  dcadec: make a number of samples per subband per subsubframe a named constant

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:36:42 +02:00
Hendrik Leppkes
98ca981a23 Merge commit '8ae1d87a2440cea0564efe2a6c9c223478a05f44' 
* commit '8ae1d87a2440cea0564efe2a6c9c223478a05f44':
  build: Add support for known custom allocators

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:29:19 +02:00
Hendrik Leppkes
4d2160c99a Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa' 
* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
  Screenpresso SPV1 decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:22:41 +02:00
Rodger Combs
9825a24e5b lavf/utils: avoid giving up probing early with long subtitle events 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 12:10:03 +02:00
Michael Niedermayer
85c92789b6 avcodec/h264_ps: Fix copying oversized pps&sps data 
Fixes: https://trac.ffmpeg.org/attachment/ticket/685/movie.264

In the available testcase the actual PPS only uses a few bits
while there are 7kbyte of apparently random data after it

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 11:55:23 +02:00
Hendrik Leppkes
5fa5e73e81 Merge commit '1aa24df74c052a73175c43e57d35b4835e537ec8' 
* commit '1aa24df74c052a73175c43e57d35b4835e537ec8':
  lavu: Deprecate AVFrame.error[]

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 09:52:39 +02:00
Hendrik Leppkes
59b55619b6 Merge commit '3f1f6053013d0015e9f115a91a11744807649a07' 
* commit '3f1f6053013d0015e9f115a91a11744807649a07':
  configure: address a copy-paste typo

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 09:32:47 +02:00
Michael Niedermayer
14f6c4356b avformat/flvdec: accept sizes if they are off by 11 
This error was produced by rtmproto.c, it is possibly such streams
where dumped, this commit is needed to support them

Fixes: z0e.flv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-02 20:18:53 +02:00
wm4
16aac9a359 avcodec/videotoolbox: fix decoding of some h264 bitstreams 
This affects Annex B streams (such as demuxed from .ts and others). It
also handles the format change in reinit-large_420_8-to-small_420_8.h264
correctly.

Instead of passing through the extradata, create it on the fly it from
the currently active SPS and PPS. Since reconstructing the PPS and SPS
NALs would be very complicated and verbose, we use the NALs as they
originally appeared in the bitstream.

The code for writing the extradata is somewhat derived from
libavformat/avc.c, but it's small and different enough that sharing it
is not really worth it.
 2015-10-02 19:09:16 +02:00
wm4
069190f707 avcodec/h264: keep SPS and PPS bitstream data 
We assume an upper bound of 4096 bytes for each raw SPS/PPS. It's hard
to determine an exact maximum size, but this value was was considered
high enough and safe.

Needed for the following VideotoolBox commit.
 2015-10-02 19:08:54 +02:00
Christophe Gisquet
74ef5449a6 dnxhddec: init scantable once permutation is set 
Otherwise, the dsp may change without its permuation being applied.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-02 18:08:36 +02:00
Christophe Gisquet
c7e14a279f dnxhddec: use dequantization formula from specs 
The current one, while correct, does not yield the best possible
results. The specificiations suggest another formula, which results
in quality gains in the decoded output from fate tests. This
justifies changing said formula.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-02 18:08:36 +02:00
Christophe Gisquet
7e4070d2e7 dnxhddec: initialize with mb-aligned dimensions 
The coded size is a multiple of the macroblock size, which is 16.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-02 18:08:36 +02:00
Paul B Mahol
160556c9ad avfilter/vf_maskedmerge: add SIMD for maskedmerge with 8 bit depth input 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-10-02 17:40:57 +02:00
Derek Buitenhuis
abaa12263e avcodec: Don't lock during open if the codec has threadsafe init 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-10-02 14:07:14 +01:00
Christophe Gisquet
e54d7e4e8e dnxhddata: Deduplicate cid 1256 chroma table 
CID 1256 is specified as using the same table for luma and chroma,
which is the same as CID 1235 luma table. This is consistent with
the format supposedly being RGB, although most sequences seem to
actually be YCbCr-encoded.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-10-02 13:12:19 +02:00
Jeremy James
1fb63d6f43 dnxhddata: Deduplicate dnx100 tables 
Tables 1258 and 1259 were not zigzagged when added, so it was not
possible to notice the equivalence.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-10-02 13:12:12 +02:00