virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
54,187 Commits 37 Branches 400 Tags 460 MiB
bad8f04b04
Commit Graph

54187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
bad8f04b04 Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598' 
* commit 'b0ce601c160c87349d093d7e542b5c752754f598':
  doc/platform: Add info about ICL

Conflicts:
	doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-25 10:46:52 +02:00
Ronald S. Bultje
cea8a0077f yuv4mpeg: correctly handle chroma for odd luma sizes. 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 19:13:58 -04:00
Matthew Heaney
1029822a91 lavf/webvttdec: use private option to specify WebVTT kind 
WebVTT subtitle tracks have four kinds. Certain downstream muxers
(such as for WebM) need to know which WebVTT kind this is, in order to
specify the codec id of the output track.

A new private input option, "-kind", has been added to the WebVTT
demuxer.  It accepts as a value any of "subtitles" (the default),
"captions", "descriptions", and "metadata".  The kind option value is
used to assign a value to the stream disposition flag, to which four
new values have been added, corresponding the four WebVTT kinds.

Signed-off-by: Matthew Heaney <matthewjheaney@google.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
 2013-06-25 00:13:47 +02:00
Matthew Heaney
bc35df29c1 lavf: add AV_DISPOSITION flags for WebVTT text track kinds 
There are 4 separate WebVTT text track kinds: subtitles (the default
if not otherwise specified), captions, descriptions, and metadata.
The WebM muxer needs to know which WebVTT text track kind this is, in
order to synthesize the correct track type and codec id.

To allow a demuxer to indicate the text track kind of the input, a new
set of AV_DISPOSITION flag values has been added, corresponding to
each of the non-default text track kind values.
 2013-06-25 00:13:47 +02:00
Derek Buitenhuis
61c82214af cllc: Use outbuf in RGB and ARGB functions 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 17:59:58 -04:00
Derek Buitenhuis
d48f221952 cllc: Implement YUV support 
Fixes ticket #1910.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 17:59:58 -04:00
Michael Niedermayer
8a7aabe80b avfilter/vsrc_testsrc: fix artifacts with odd height 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 23:21:17 +02:00
Derek Buitenhuis
b0ce601c16 doc/platform: Add info about ICL 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 13:06:01 -04:00
Michael Niedermayer
bbe26eff22 h264: Fix null pointer dereference with disabled error concealment 
Fixes Ticket2551

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 16:05:19 +02:00
Michael Niedermayer
a46e578dda avformat/avio: Fix EOF handiling of ffurl_read_complete() 
Fixes Ticket2537

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 14:23:44 +02:00
Michael Niedermayer
f48366c704 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: don't abort if both encoder and muxer aspect ratios are not set

Conflicts:
	libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 11:42:42 +02:00
Michael Niedermayer
a620c8321e Merge commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1' 
* commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1':
  matroskaenc: restore compatibility with non referenced AVPacket

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 11:11:31 +02:00
Michael Niedermayer
af5f9c0876 Merge commit '95d52464542f532061290192518d5fe1c1930e8d' 
* commit '95d52464542f532061290192518d5fe1c1930e8d':
  lavc: Add option to encode MPEG-2 AAC with libfdk-aac

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 10:57:04 +02:00
Michael Niedermayer
14a61bc3f9 Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203' 
* commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203':
  configure: whitespace cosmetics

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 10:41:37 +02:00
Michael Niedermayer
1152863a3f Merge commit '6dc6598692da3b0ebda2d768681786343f26a4f4' 
* commit '6dc6598692da3b0ebda2d768681786343f26a4f4':
  configure: Simplify an expression with enabled_all.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 10:16:12 +02:00
Rafaël Carré
e21307a2b0 lavf: don't abort if both encoder and muxer aspect ratios are not set 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-06-24 08:03:26 +02:00
Rafaël Carré
c3e58f8fb7 matroskaenc: restore compatibility with non referenced AVPacket 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-06-24 08:03:26 +02:00
Kieran Kunhya
95d5246454 lavc: Add option to encode MPEG-2 AAC with libfdk-aac 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-06-24 08:03:26 +02:00
Michael Niedermayer
5dba888dd5 msmpeg4: Fix ff_msmpeg4_pred_dc() so it works with lowres>0 
Fixes Ticket2532

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 03:44:30 +02:00
Michael Niedermayer
46312fc2a9 cmdutils: dont change the log level for -report 
Fixes Ticket2476

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 02:59:05 +02:00
Michael Niedermayer
9375f5003d sonic: use av_freep() as its safer than av_free() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 19:45:39 +02:00
Michael Niedermayer
69d0a2922f sonic: cleanup/simplify num_taps check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 19:44:24 +02:00
Michael Niedermayer
db27dadcb0 sonic: replace divide() by ROUNDED_DIV() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 19:42:24 +02:00
Ronald S. Bultje
c329713de7 vp8: wait for prev_frame to parse segment_map before reading it. 
This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 17:13:58 +02:00
Michael Niedermayer
fb0df5c113 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: More msvc/icl combining

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 13:45:46 +02:00
Michael Niedermayer
780b1aa1ef Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082' 
* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082':
  ogg: relax demuxer conformance checks

Conflicts:
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 13:21:21 +02:00
Michael Niedermayer
cc61ef0479 Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790' 
* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790':
  avconv: report the error for codec open failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 12:56:55 +02:00
Michael Niedermayer
d894e64acc Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f' 
* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f':
  avconv: drop additional strerror fallback

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 12:56:05 +02:00
Diego Biurrun
ace87c19ed configure: whitespace cosmetics 2013-06-23 12:24:31 +02:00
Diego Biurrun
6dc6598692 configure: Simplify an expression with enabled_all. 2013-06-23 12:00:08 +02:00
Michael Niedermayer
730e07f10b sonic: avoid float sqrt() for integer input & output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 01:35:34 +02:00
Michael Niedermayer
4ec7ef56bd sonic: simplify quant cliping 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 01:35:34 +02:00
Michael Niedermayer
bcb42fb6db sonic: use av_calloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 01:26:18 +02:00
Alex Smith
f11e4045b9 configure: More msvc/icl combining 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-22 17:00:57 -04:00
Oka Motofumi
81c5ceeda2 avisynth: Make sure the filename passed to Avisynth is in the right code page 
Avisynth is a non-unicode application and cannot accept UTF-8
characters. Therefore, the input filename should be converted to
the code page that it expects.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-22 16:41:43 -04:00
Derek Buitenhuis
8bdbabfaa4 configure: Enable MinGW-w64's implementation of vsnprintf and pals 
As of r5799 in MinGW-w64's trunk, which is he upcoming major version 3,
the POSIX-compliant vsnprintf implementation is disabled by default.
Enable it for this version. Keep using out own implementation for
prior versions, because it is broken in them.

Relevant Reference Thread: http://article.gmane.org/gmane.comp.gnu.mingw.w64.general/7133

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-22 16:37:40 -04:00
Michael Niedermayer
37c7a8be19 sonic: replace literal numbers by sizeof() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 22:25:18 +02:00
Michael Niedermayer
081a7f3ed0 sonic: replace some float by integers to improve platform independance 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 21:58:13 +02:00
Michael Niedermayer
12de2933da sonic: Improve error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 21:42:04 +02:00
Michael Niedermayer
8689ee0eef sonic: simplify shift_down() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 21:34:11 +02:00
Luca Barbato
f963f701d9 ogg: relax demuxer conformance checks 
Some samples in the wild are missing headers that are expected by the
specification but in practice do not affect decoding.
 2013-06-22 20:54:59 +02:00
Luca Barbato
42cc6cefd3 avconv: report the error for codec open failure 
External codec may have corner case reason to fail at init, better
report them instead having the user wonder.
 2013-06-22 20:54:59 +02:00
Luca Barbato
1e340af8d6 avconv: drop additional strerror fallback 
strerror_r is called by av_strerror already.
 2013-06-22 20:54:59 +02:00
Michael Niedermayer
b6ce50a2d4 avutil/ripemd: adjust loop condition to silence CID1035716 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 14:52:29 +02:00
Hendrik Leppkes
d76fff7df7 smvjpeg: use refcounted frames to avoid mem leaks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 11:58:46 +02:00
Hendrik Leppkes
1a405c683e smvjpeg: remove redundant frame init code 
avctx->coded_frame is not used for decoders anymore,
and av_frame_alloc does all the frame initialization required.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 21:53:34 +02:00
Hendrik Leppkes
7cdf574c22 swscale: fix filter alignment reduction without inline asm 
Fixes scaling in MSVC/ICL, where inline asm is not present, but the
YASM scaling code is.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 21:01:11 +02:00
Michael Niedermayer
d6a33f5d20 h264: fix size of arrays in ff_h264_check_intra_pred_mode() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 20:48:07 +02:00
Michael Niedermayer
2005fddcbb h264/ff_h264_check_intra_pred_mode: fix input value check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 20:48:07 +02:00
Stefano Sabatini
7cc4115dd6 doc/decoders,decoders: add various missing final dots 
Enhance consistency.
 2013-06-21 18:25:49 +02:00