virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
53,210 Commits 37 Branches 400 Tags 467 MiB
24c65eb29f
Commit Graph

53210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luca Barbato
7cbc4cb442 fate: update the mmf reference 
Using Optional Data chunk introduced changes the hash.
 2013-05-14 18:50:27 +02:00
Stefano Sabatini
e65c4a2330 doc/outdevs: fix typos (devices -> device) 2013-05-14 18:46:14 +02:00
Paul B Mahol
811b17fbad lavfi: cosmetics: fix vertical alignment for pads in some filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-14 15:31:56 +00:00
Yoshihisa Uchida
3dff1bf99c mmf: Write metadata into an Optional Data chunk 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-05-14 17:14:38 +02:00
Diego Biurrun
a349458e67 jpeg2000dec: Use correct printf length modifier for pointer differences 
Also eliminate an unnecessary cast. Fixes the following warning:
jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’
 2013-05-14 16:46:56 +02:00
Michael Niedermayer
dc6f1a8dda avformat/srtdec: Fix pointer corruption 
This fixes use of uninitialized memory and possible out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 16:38:33 +02:00
Martin Storsjö
5d9d8461fb vc1dec: Don't apply the loop filter on fields 
Fixes read of uninitialized memory.

Based on a patch by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 14:36:00 +03:00
Michael Niedermayer
6b13f54262 vf_colorchannelmixer: round lut entries to nearest 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:51:22 +02:00
Michael Niedermayer
f268727a8f fate: change colorchannelmixers coefficients to be less unstable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:49:11 +02:00
Hendrik Leppkes
fe06795d78 vc1: implement frame interlaced b-frame header parsing 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 13:24:55 +03:00
Michael Niedermayer
46430fd47c vc1dec: Don't attempt error concealment on field pictures 
This is not implemented and doesn't work.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 13:24:52 +03:00
Michael Niedermayer
509cc1e883 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Disable PIC for cygwin just as for win32/mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:21:48 +02:00
Michael Niedermayer
a887372109 Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 
* commit '1399931d07f0f37ef4526eb8d39d33c64e09618a':
  x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:12:20 +02:00
Sebastian Sandberg
1bd57a850a vc1dec: fieldtx is only valid for interlaced frame pictures 
The fieldtx_plane is not cleared for interlaced fields.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 12:44:09 +03:00
Claudio Freire
8bbdd20a29 aacenc: Fix erasure of surround channels 
This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 12:42:05 +03:00
Claudio Freire
f4d0a63b5b aacenc: Fix target bitrate for twoloop quantiser search 
This fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 12:42:04 +03:00
Claudio Freire
7c71ada4ca aacenc: Fix a rounding bug in aacpsy channel bitrate computation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 12:42:03 +03:00
Michael Niedermayer
b2da63db50 Merge commit '245b76a108585b6fb52eebc2626c472d6fa530dc' 
* commit '245b76a108585b6fb52eebc2626c472d6fa530dc':
  x86: dsputil: Split inline assembly from init code

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Note, the author attribution is left in place and not removed
as it is in the merged commit.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 11:19:20 +02:00
Michael Niedermayer
eda9d97b7a Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be' 
* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
  x86: dsputil: Refactor pixels16 wrapper functions with a macro

Conflicts:
	libavcodec/x86/hpeldsp_avg_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 10:18:46 +02:00
James Darnley
d10499a32a yadif: correct strides in filter_edges_16bit 
The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-14 09:24:13 +02:00
James Darnley
b0ef0ae776 yadif: restore speed of the C filtering code 
Always use the special filter for the first and last 3 columns (only).

Changes made in 64ed397 slowed the filter to just under 3/4 of what it
was.  This commit restores the speed while maintaining identical output.

For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-14 09:23:55 +02:00
Matt Wolenetz
252c0bfdc0 lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors) 
This fixes https://bugzilla.libav.org/show_bug.cgi?id=514.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 10:04:43 +03:00
burek
56ba331257 doc/filters: add some examples for the fps filter 
Signed-off-by: burek <burek021@gmail.com>
 2013-05-14 00:33:52 +00:00
Hendrik Leppkes
37d9784083 md5enc: don't reuse priv_class in two formats 
Apparently, this is not allowed and can trip up all sorts of things.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 23:39:29 +02:00
Reimar Döffinger
7d1d596817 Add a generic hash API. 
Also use this API in framemd5.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-05-13 21:42:37 +02:00
Reimar Döffinger
86215c326e Add 128 bit murmur3 hash function. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-05-13 21:42:37 +02:00
Andrey Utkin
47a628bfb3 avfilter: Add 'drawgrid' video filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 21:34:15 +02:00
Martin Storsjö
05165c2f7a configure: Disable PIC for cygwin just as for win32/mingw 
If this is explicitly disabled for win32/mingw, it should also
be disabled for cygwin, for consistency and for the same reasons
as for win32/mingw.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-13 20:20:55 +03:00
Joseph Artsimovich
3967f68053 Better handling for MXF essence reading reaching EOF. 
If no metadata follows MXF essence, that is essence ends with EOF,
"Operation not permitted" error was produced and a non-zero code
was returned from ffmpeg executable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 19:03:04 +02:00
Michael Niedermayer
1e00bbb10c avcodec/lcldec: Check that dimensions are a multiple of the subsample factors 
Other dimensions would not work correctly currently,
also ask for a sample for files that fail this check.

This fixes an integer overflow leading to out of array
accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 18:52:00 +02:00
Clément Bœsch
b3c263e209 lavu/common: make FF_CEIL_RSHIFT faster when shift is constant. 
See "[PATCH] lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding."
thread for more information.
 2013-05-13 17:53:16 +02:00
Michael Niedermayer
45150f90e7 fate: fix filter-colorchannelmixer by adding bitexact & accurate flags 
Idea by durandal11707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 17:15:58 +02:00
Paul B Mahol
8671e995c8 imgconvert: silence "incompatible pointer type" warning 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-13 14:42:41 +00:00
Michael Niedermayer
f9db2fc84d cdgraphics: initialize buffer 
Prevent use of uninitialized memory

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 14:39:32 +02:00
Michael Niedermayer
e6b6ae4695 vorbisdec: check codebook entry count 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 14:27:35 +02:00
Stefano Sabatini
3a4c8788e3 tools/ffeval: use av_dynarray2_add() 
Simplify, increment robustness.
 2013-05-13 13:52:37 +02:00
Stefano Sabatini
e3984166a4 lavu/mem: add av_dynarray2_add() 
Based on a patch by Clément Bœsch.

See thread:
From: Clément Bœsch <ubitux@gmail.com>
Subject: [FFmpeg-devel] [PATCH 1/5] lavu: add av_dynarray_alloc_elem().
Date: Sun, 14 Apr 2013 03:07:54 +0200
 2013-05-13 13:52:31 +02:00
Stefano Sabatini
84be806982 lavu: define FF_MEMORY_POISON and use it 
Allow single-place definition of constant used to fill poisoned memory.
 2013-05-13 13:52:26 +02:00
Michael Niedermayer
e70e2583d0 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Do not read strd chunk in avi files as H264 extradata.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 13:25:12 +02:00
Paul B Mahol
2dedd8988a fate: add colorchannelmixer test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-13 10:57:48 +00:00
Carl Eugen Hoyos
231b331718 Do not read strd chunk in avi files as H264 extradata. 
Fixes ticket #2561.
 2013-05-13 12:39:44 +02:00
Paul B Mahol
4383e1b239 tests/lavf-regression: fix gbrp10 dpx test on big endian 
For some reason only for that pix format decoder picks native format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-13 10:09:03 +00:00
Michael Niedermayer
df4f4fc8a5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: x86: Only enable cpunop on i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 11:36:46 +02:00
Michael Niedermayer
69d52ef8ff Merge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199' 
* commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199':
  configure: Rename cmov processor capability to i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 11:29:40 +02:00
Michael Niedermayer
6585275e79 Merge commit 'e08c946c6860a78b0c479551d5f6735361160cbd' 
* commit 'e08c946c6860a78b0c479551d5f6735361160cbd':
  configure: Explicitly disable PIC when targeting win32/mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 11:23:16 +02:00
Michael Niedermayer
352eb1f02f Merge commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121' 
* commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121':
  configure: Use enable_weak when enabling pic

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 10:53:18 +02:00
Andrey Utkin
bc63a76083 pngenc: Add 'dpi', 'dpm' options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 00:12:45 +02:00
Paul B Mahol
c0a30dd2e4 fate: increase coverage for dpx encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 22:04:40 +00:00
Paul B Mahol
ae9ef151ad dpxenc: simplifiy code using AVPixFmtDescriptor 
Update rgb24 fate test as it no longer writes image in big endian
format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 21:56:29 +00:00
Paul B Mahol
22a038606c dpxenc: do not set coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 21:15:59 +00:00