ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 22:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,376 Commits 36 Branches 398 Tags 535 MiB
c8b1612af0
Commit Graph

78376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Bradshaw
1c40bccc09 lavc/dirac_dwt: fix building without asm 
clang needs HAVE_MMX to be first in order to avoid an undefined
reference error.
 2016-02-06 01:14:19 +01:00
Henrik Gramner
aa751573fe avcodec/h264: Fix segfault in 4:2:2 chroma deblock with 32-bit msvc 
Using rNm and x86inc's stack allocation with a negative value at the same
time isn't supported, and caused the original stack pointer to be clobbered
when using a compiler that doesn't support stack alignment.
 2016-02-05 22:01:38 +01:00
Marton Balint
6d14e32555 lavf/asfenc: add support for setting packet size 
This can provide a manual workaround for ticket #4230.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
22bbd6e8b7 lavf/asfenc: add support for storing creation time 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
79e4293613 lavf/asfenc: add support for storing languages 
Checked compatiblity with VLC, Windows Media Player 12 and Windows Media ASF
Viewer 9 series.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
0464767301 lavf/asfenc: check the number of streams in header 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
7e6b788f7c lavf/asfenc: add AVClass to context 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Paul B Mahol
b1fe794033 avfilter/split: support any channel count for asplit filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-05 21:05:47 +01:00
James Darnley
7042a55c55 avcodec/h264: mmxext 4:2:2 chroma deblock/loop filter 
2.6 times faster (366 vs. 142 cycles)
 2016-02-05 17:26:04 +01:00
Mats Peterson
9556446623 lavc/rawdec: Use 16-byte line alignment for B1W0 and B0W1 video in nut 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-05 15:40:49 +01:00
James Almer
16af350ac5 avcodec/dcadsp: replace intptr_t with ptrdiff_t 
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-05 11:17:04 -03:00
Trevor \\\\ Higgins
6632802aa0 x11grab: fixed next frame capture time calculation 
The next frame time could slip, causing the frame rate to drop until
 frames were dropped. Now will capture at the next correct moment instead.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-05 01:11:17 +01:00
Eran Kornblau
1bbfaba196 avformat/mov: dont print frma warning when format is the same 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-05 01:11:04 +01:00
Michael Niedermayer
1693336aed avfilter/af_apulsator: assert that pathes leaving uninitialized variables do not occur 
Fixes: CID1341581, CID1341582

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-04 23:14:02 +01:00
James Almer
4c573f8ce9 fate: fix fate-aac-pns-encode failures on non-sse x86_32 targets 
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-04 14:53:31 -03:00
Paul B Mahol
f862ff750b avfilter/vf_stack: free input pads name on uninit 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-04 18:02:29 +01:00
Carl Eugen Hoyos
a36c737490 lavf/isom: Add more code points for H264. 
Defined by the MP4 registration authority.
Fixes ticket #5217.
 2016-02-04 17:40:06 +01:00
Michael Niedermayer
f89bc661b4 avfilter/af_afftfilt: Set last_expr to the default 
This fixes a null pointer dereferece
Fixes: CID1351346

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-04 15:13:39 +01:00
Hendrik Leppkes
a969a914f5 dca_parser: ensure frame duration matches the actual sample rate 
The parser only parses the core, and thus has a duration relative
to the core sample rate only, not the actual stream sample rate.

FATE references changed due to now correct timestamps.
 2016-02-04 12:16:19 +01:00
James Almer
b3b0ecee15 x86/emms: empty the mmx state unconditionally on supported targets 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-04 01:49:01 -03:00
Michael Niedermayer
37db3e8931 avcodec/libutvideoenc: Add NULL termintor to options 
Fixes segfaults

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-04 02:17:57 +01:00
Michael Niedermayer
61ea7f1509 swscale/swscale-test: Check av_image_fill_linesizes() for failure 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-04 01:49:38 +01:00
James Almer
0711c5bfb8 avutil/aes_crt: free AVAESCTR struct properly 
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-03 19:33:23 -03:00
Derek Buitenhuis
c4ef6c883b mjpegenc: Remove duplicate initializer 
This was causing c99conv to crash.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 22:14:27 +00:00
Derek Buitenhuis
0ea716f70b libutvideo: Unbreak 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 19:27:24 +00:00
Rostislav Pehlivanov
f021030365 diradec: split tables away to a separate diractab file 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-03 17:19:33 +00:00
Rostislav Pehlivanov
3bbe7862ec diracdec: move the MAX_DWT_LEVELS macro to dirac.h 
Used by the VC-2 encoder.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-03 17:19:30 +00:00
Derek Buitenhuis
0627826523 Merge commit '68395f8c99393c281a08139d20a7a04398b2fd04' 
* commit '68395f8c99393c281a08139d20a7a04398b2fd04':
  qsvenc: fix a typo

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 17:13:56 +00:00
Derek Buitenhuis
4736f8115b Merge commit 'cc602061ee860b041013397e27a036b85cd87b09' 
* commit 'cc602061ee860b041013397e27a036b85cd87b09':
  x86inc: Add debug symbols indicating sizes of compiled functions

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 17:12:32 +00:00
Derek Buitenhuis
9de85c544a Merge commit '002c47798da0c43a053822c8041144798d49ed84' 
This is a NOOP.

* commit '002c47798da0c43a053822c8041144798d49ed84':
  x86inc: Avoid creating unnecessary local labels
  x86inc: Simplify AUTO_REP_RET
  x86inc: Use more consistent indentation
  x86inc: Preserve arguments when allocating stack space
  x86inc: Improve FMA instruction handling
  x86inc: Be more verbose in assertion failures
  x86inc: Make cpuflag() and notcpuflag() return 0 or 1

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 17:07:47 +00:00
Derek Buitenhuis
74f5cb0189 Merge commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab' 
* commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab':
  pixdesc: fix and extend doxy for av_pix_fmt_get_chroma_sub_sample()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:59:06 +00:00
Derek Buitenhuis
27acb64a53 Merge commit 'c0c4d7a0a556ec66e3068d36a883e84d1efb0690' 
* commit 'c0c4d7a0a556ec66e3068d36a883e84d1efb0690':
  configure: Correctly add openssl cflags and libs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:57:46 +00:00
Derek Buitenhuis
2880e6810c Merge commit '87a814fdce522d45aa31aa258cb5514d7e754bff' 
* commit '87a814fdce522d45aa31aa258cb5514d7e754bff':
  libavcodec: Add missing AVClass pointers

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:57:07 +00:00
Derek Buitenhuis
730d2aabac Merge commit '0e9c4fe254073b209970df3e3cb84531bc388e99' 
* commit '0e9c4fe254073b209970df3e3cb84531bc388e99':
  lavc: Move pre_me to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:54:20 +00:00
Derek Buitenhuis
43c0298208 Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607' 
* commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607':
  lavc: Move me_penalty_compensation to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:53:13 +00:00
Derek Buitenhuis
f3af379b5c Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a' 
* commit '2862b63783b5556f7f3fb2d097629bc6879f833a':
  lavc: Move prediction_method to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:49:19 +00:00
Michael Niedermayer
908d010b12 avfilter/af_sidechaincompress: Free out frame on error 
Fix memleak
Fixes CID1197065 part 2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-03 17:09:24 +01:00
Michael Niedermayer
edc34c937b avcodec/utils: Check the return code of av_image_fill_linesizes() 
Fixes CID1271741

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-03 15:58:32 +01:00
Schenk, Michael
93f4b41208 avformat/http: add crypto to default whitlist to get encrypted HLS working again 
I think we missed the crypto in the default_whitelist in case of http. Otherwise encrypted HLS will fail with

[hls,applehttp @ 0x2af39c00] playlist[0] open_input [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts], start_seq_no [1], cur_seq_no [14]

[hls,applehttp @ 0x2af39c00]    open_input curseqno [14] startseqno [1]

[hls,applehttp @ 0x2af39c00] HLS request for url 'http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts', offset 0, playlist 0

[NULL @ 0x2af3a200] KEY_AES_128 seg->key [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key] pls->key_url [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key]

[hls,applehttp @ 0x2af39c00]     open_input [KEY_AES_128]

[hls,applehttp @ 0x2af39c00]      : c->persistence [0]

[hls,applehttp @ 0x2af39c00]      : c->probing     [1]

[hls,applehttp @ 0x2af39c00]      : pls->input     [NULL]

[hls,applehttp @ 0x2af39c00]        using normal http path for URL [crypto+http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts]

[crypto @ 0x2aff7cc0] Protocol not on whitelist 'http,https,tls,rtp,tcp,udp!

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-03 15:57:43 +01:00
Tobias Rapp
ca71e6052e doc/demuxers: add some concat demuxer script examples 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
 2016-02-03 13:30:48 +01:00
Paul B Mahol
c1b23e158c avfilter/vf_nnedi: fix ISO C90 warnings 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-03 09:38:11 +01:00
Timothy Gu
0ab25dac2f cinepakenc: Stop using AVPicture 2016-02-02 18:06:13 -08:00
Timothy Gu
13b8ba8c9d xv: Remove AVPicture usage 2016-02-02 18:06:13 -08:00
Timothy Gu
228eb6708b sdl: Remove AVPicture usage 2016-02-02 18:06:13 -08:00
Andreas Cadhalpun
916da13d6d cfhd: fix off-by-one error in level check 
This fixes out-of-bounds writes causing segmentation faults.

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-02-03 01:19:45 +01:00
Matthias Hunstock
e9025573fa decklink: support all valid numbers of audio channels 
As it is already written in the documentation, BMD DeckLink cards
are capable of capturing 2, 8 or 16 audio channels (for SDI Inputs).
Currently the value is hardcoded to 2. Introduces new option.

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-03 00:34:26 +01:00
Hendrik Leppkes
5fc310f7ca dca: add emms_c after usage of AV_COPY128 
Similar to AV_ZERO128, AV_COPY128 can use MMX instructions in x86
 2016-02-02 23:27:30 +01:00
Hendrik Leppkes
0b1972d409 dca: add emms_c after AV_ZERO128 macros 
AV_ZERO64/128 can use MMX on x86.

Reviewed-By: James Almer <jamrial@gmail.com>
 2016-02-02 20:06:13 +01:00
Hendrik Leppkes
084ab31049 dca: add new fate tests based on the dcadec-samples test suite 2016-02-02 17:43:42 +01:00
Hendrik Leppkes
da6ee11ecf dca: split decoder fate tests into dca.mak 2016-02-02 17:43:39 +01:00