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
78,109 Commits 37 Branches 400 Tags 460 MiB
949d6dd51c
Commit Graph

78109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Buitenhuis
949d6dd51c Merge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:29:21 +00:00
Derek Buitenhuis
d97a6193c3 Merge commit '03ef89faf23c4851848208c9fe004cd9ef690cec' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:27:19 +00:00
Derek Buitenhuis
ea2df33052 Merge commit '4f22b138886e29f7fffa8c715673951e51be9f32' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:23:31 +00:00
Derek Buitenhuis
66eb8ce473 Merge commit 'b06cb15b9d7928bf54b639c9f9f7658c2c38bfb9' 
One big NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:21:20 +00:00
Derek Buitenhuis
42f0ed67a3 Merge commit 'c59fec783d6540dd96540b079d753ee4a6ad2e58' 
This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 17:45:50 +00:00
Derek Buitenhuis
a54422fff2 Merge commit '39571e86cb0d55536f649210a025c54e440c632b' 
This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 17:20:21 +00:00
Derek Buitenhuis
257766a838 Merge commit '9cce011b1d2f66366f5d75a024c2a2f93dc2b589' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:57:24 +00:00
Derek Buitenhuis
895b888f16 Merge commit '521dc78366c6ea54b7b69426dab302a57231f81e' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:56:22 +00:00
Derek Buitenhuis
e5fe75ae2b Merge commit 'fa66237b69c27befa788b100e73783e0f47fe1b7' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:54:57 +00:00
Derek Buitenhuis
71b79b587b Merge commit '62825236dba31a2240e25974a3ba41c1303e4edc' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:53:23 +00:00
Derek Buitenhuis
9f18be42f0 Merge commit '81737f42c28858dad76a40284a35f7a64faa2fc7' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:51:06 +00:00
Derek Buitenhuis
711dae575d Merge commit '46350db737a15910f468d30cf7beda16a4cc8332' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:47:46 +00:00
Derek Buitenhuis
dbbfbde085 Merge commit 'e8bc642202c10beda1ea4e93ec8492b1e39805e5' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:46:58 +00:00
Derek Buitenhuis
21f9468402 avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT 
Libav, for some reason, merged this as a public API function. This will
aid in future merges.

A define is left for backwards compat, just in case some person
used it, since it is in a public header.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:36:46 +00:00
Michael Niedermayer
0aada30510 avcodec/jpeg2000dec: More completely check cdef 
Fixes out of array read
Fixes: j2k-poc.bin

Found-by: Lucas Leong <wmliang.tw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-27 17:18:00 +01:00
Paul B Mahol
75a7565bcb avcodec/dvaudiodec: support cases when codec_tag is not set but block_align is 
Support packets larger than block size, return single block size.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-27 13:58:25 +01:00
Paul B Mahol
74e8f4f674 avcodec/dvaudiodec: set channel layout 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-27 11:19:58 +01:00
Paul B Mahol
ce404b4d7c avfilter/af_afade: do not duplicate curve option 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-27 11:11:51 +01:00
Carl Eugen Hoyos
7a90edc188 lavc/mjpegdec: Set SAR even if no resolution is available. 
Fixes ticket #4479.
 2016-01-27 10:23:37 +01:00
Carl Eugen Hoyos
69dbecf920 lavc/h264: Show "Increasing reorder buffer" message with loglevel info. 
See ticket #5138 for a sample.
 2016-01-27 10:11:46 +01:00
Matt Oliver
b66ac803fa avformat/mux: Fix error when writing uncoded frames. 
commit "avpacket: Deprecate av_dup_packet" broke the use
av_interleaved_write_uncoded_frame as any input uncoded frame has an
invalid packet size that will crash when av_packet_ref tries to allocate
'size' new memory. Since the packet is a temporary created within mux.c
itself it can be used directly without needing a new ref.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
 2016-01-27 17:16:43 +11:00
Andreas Cadhalpun
9079e99d2c svq1enc: fix out of bounds reads 
level can be 5, but there are only four codebooks.

Fixes ubsan runtime error: index 5 out of bounds for type 'int8_t
[4][96]'

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-27 00:08:23 +01:00
Paul B Mahol
11bc4fd653 avcodec/dvaudiodec: only stereo makes sense 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-26 23:33:55 +01:00
Paul B Mahol
e9e623369d avcodec: add Ulead DV audio decoder 
Fixes #1564.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-26 23:14:40 +01:00
Paul B Mahol
df7b165e87 avfilter/vf_zscale: make it possible to override input frame parameters 
Mostly useful when there is no such parameters present at all.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-26 23:13:16 +01:00
Ivan
a0174f6729 avformat/flvenc: copyts in FLV muxer 
The purpose of this patch is to preserve timestamps when using ffmpeg for publishing RTMP streams, e.g. ffmpeg -i rtmp://source/stream -f flv rtmp://target/stream.
There is a setting "copyts" for that purpose. Unfortunately it doesn't work with FLV muxer because it has its own timestamp correction which makes global setting "copyts" ineffective.

This patch removes timestamp correction in FLV muxer. This means FLV will rely on ffmpeg timestamp correction which makes it possible to use copyts.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-26 20:56:55 +01:00
Vittorio Gambaletta (VittGam)
74658a8b4d ffmpeg_opt: Allow -metadata option to set metadata on programs. 
Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-26 17:36:08 +01:00
Vittorio Gambaletta (VittGam)
6e448fb97e ffmpeg_opt: Move the 'process manually set programs' block above 'process manually set metadata' in open_output_file(). 
Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-26 17:36:08 +01:00
Michael Niedermayer
f3ace85d88 avutil/opt: check for and handle errors in av_opt_set_dict2() 
Previously errors could result in random entries to be lost.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-26 17:36:08 +01:00
Hendrik Leppkes
2e31434d84 swscale: add P010 input support 2016-01-26 12:10:45 +01:00
Hendrik Leppkes
c2869b4640 avutil: add P010 pixel format 
P010 is the 10-bit variant of NV12 (planar luma, packed chroma), using two
bytes per component to store 10-bit data plus 6-bit zeroes in the LSBs.
 2016-01-26 11:54:01 +01:00
Andreas Cadhalpun
38622007c4 vf_libopencv: add support for opencv 3 
It dropped the old headers, but the replacements are already available
with opencv 2.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-25 23:49:22 +01:00
Marton Balint
73e4565dff lavc/libzvbi-teletextdec: add support for setting background opacity 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-25 22:15:27 +01:00
Marton Balint
92f2a9dbc5 lavc/libzvbi-teletextdec: remove cmax variable 
Use VBI_NB_COLORS instead.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-25 22:06:57 +01:00
Marton Balint
fe4a2cbd4d lavc/libzvbi-teletextdec: use the built-in transparent color for transparent background 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-25 22:06:57 +01:00
Andreas Cadhalpun
b46aae0936 build: use a link instead of changing current directory when compiling 
If links don't work, fall back to using the full source path as was
previously done.

This should fix build failures with MSVC.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-25 20:43:34 +01:00
Vittorio Gambaletta (VittGam)
8b02af1e6f avformat/mpegtsenc: Fix multi program so that it supports adding the same stream to multiple programs. 
Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-25 19:47:16 +01:00
Mats Peterson
191ec55c9f lavc/rawdec: Use 16-byte line alignment for AV_PIX_FMT_MONOWHITE 
The line alignment for 1 bpp raw AV_PIX_FMT_MONOWHITE video (currently
used for AVI) was previously 4 bytes, which generated alignment warning
messages, not only for odd-width files. The alignment is now 16 bytes.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-25 19:47:16 +01:00
James Almer
209f50e16b avcodec/synth_filter: split off remaining code from dcadec files 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-25 14:57:38 -03:00
Paul B Mahol
5dc37a5d8a avcodec/dcaenc: do not change user requested bitrate 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-25 17:10:49 +01:00
Paul B Mahol
06f65fd026 avcodec/dcaenc: return correct number of bytes in output packet 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-25 17:10:49 +01:00
Michael Niedermayer
ed0c550564 avcodec/utils: run ff_frame_thread_encoder_init() only for encoders 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-25 16:47:15 +01:00
Michael Niedermayer
46f67f4a34 avcodec/rawdec: Check height and packet size 
Avoids potential division by 0

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-25 11:07:42 +01:00
Mats Peterson
82325dbec1 lavc/rawdec: Use 16-byte line alignment for 1, 2, 4 and 8 bpp 
This patch aligns the lines of 1 bpp depth for QuickTime, and 2, 4 and 8
bpp depths for AVI and QuickTime, on 16-byte boundaries. At the same
time, the packet row stride is properly catered for.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-25 11:07:42 +01:00
Mats Peterson
fe7639b1c8 avcodec/rawdec: initialize palette for mono 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-25 11:07:42 +01:00
James Almer
1d8f9b7d1a avcodec/webp: fix decoder dependencies 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-24 20:30:33 -03:00
Michael Niedermayer
cde57eee98 avformat/hls: Check that filename is not "" in probe before checking its extension 
Possibly the check as a whole causes more problems than it helps, if so dont
hesitate to remove it

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-25 00:18:57 +01:00
Paul B Mahol
3e7d684912 avcodec/flacenc: fix calculation of bits required in case of custom sample rate 
Sample rate of 11025 takes 16 bits but previous code would pick only 8.
Fixes assertion failure.

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-24 21:54:13 +01:00
Timothy Gu
ce36cb08ed Revert "decklink: Header cleanup" 
This reverts commit 61fb70c386.

Reported in #5183 to break the build. Further investigation needed.
 2016-01-24 12:42:39 -08:00
Paul B Mahol
f42eae96b2 avfilter/vf_zoompan: fix pts handling 
Now output pts have some sense.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-24 20:29:19 +01:00