generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
69,717 Commits 24 Branches 241 Tags 173 MiB
7862325f80
Commit Graph

69717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
5763f67502 avformat/mov: Check dimensions before setting aspect 
Fixes division by 0
Fixes: asan_heap-uaf_143f420_728_cov_1441472032_HDV_0113.MP4

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 14:52:15 +01:00
Michael Niedermayer
b74ecb82fa swresample/x86/rematrix_init: Check av_malloc* return codes, forward errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 10:15:56 +01:00
Michael Niedermayer
48ffaaaaef swresample/x86/rematrix_init: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 10:15:56 +01:00
Michael Niedermayer
d80fe5d4bc avcodec/vb: Check for av_mallocz() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 09:27:16 +01:00
Michael Niedermayer
694671bc9a avfilter/f_sendcmd: consider it an error if there are no commands 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 07:13:48 +01:00
Georg Lippitsch
c0367f78d5 doc/indevs: Docs for Blackmagic high bit depth video/audio 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 01:18:58 +01:00
Seppo Tomperi
03cecf45c1 hevcdsp: ARM NEON optimized transforms 
cherry picked from commit b153f55935969c794de4640f8d34e01c58e027ae

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 23:29:35 +01:00
Christophe Gisquet
b61b9e4919 x86: hevc_mc: remove lea in EPEL_LOAD 
The second parameter to the macro is always an immediate address,
so no lea is needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 22:19:35 +01:00
Christophe Gisquet
4919b38421 x86: hevc_mc: fewer gpr autoloads for _v filters 
In that case, it's just to load my, but mx/r3src is not used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 22:19:34 +01:00
wm4
6a5b8ca432 lavf: remove unused code 
Nothing uses it, and it provides no public API.

Archeological finds:

Commit 101036adb9 added the API.
Commit a8dd8dc6e9 made mpegts.c use it.
Commit af8aae3fa3 disabled it by default in mpegts.c.
Commit ae2bb52cd2 removed all uses of this from mpegts.c.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-02-08 21:34:05 +01:00
Anton Khirnov
0232ba62a2 frame: clarify buf documentation 
Mention explicitly that the array must be filled contiguously.
 2015-02-08 21:28:31 +01:00
Anshul Maheshwari
1df841f154 doc/APIchanges: updated Data stream changes in APIChange 
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 18:39:22 +01:00
Michael Niedermayer
162f344971 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix standalone compilation of the mov muxer with --disable-optimizations.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 17:31:31 +01:00
Clément Bœsch
55feff57ce avfilter/hqdn3d: an invalid bit depth means a bug, not invalid read data 
This code looks clumsy, and an assert would probably be more welcome.
 2015-02-08 17:16:51 +01:00
Clément Bœsch
4b60bd1aac avformat/internal: fix av_interleaved_write_frame typo reference 2015-02-08 17:09:12 +01:00
Carl Eugen Hoyos
a2bc8c5601 Fix standalone compilation of the mov muxer with --disable-optimizations. 
Reported-by: Bernhard Döbler
 2015-02-08 15:48:26 +01:00
Clément Bœsch
eb7efaa924 avfilter/dctdnoiz: fix slice_h computation 
ceilf() can only work if the reminder of the division is not 0.

This fixes memory errors with for instance:
  ffmpeg -f lavfi -i testsrc=s=800x500 -threads 3 -vf dctdnoiz -frames:v 1 -f null -
 2015-02-08 14:31:29 +01:00
Michael Niedermayer
009a57b479 avformat/mxfenc: Remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 13:02:35 +01:00
Eejya Singh
40b198e987 lavfi/subtitles: add force_style option 
Signed-off-by: Eejya Singh <singh.eejya@gmail.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
 2015-02-08 11:36:49 +01:00
Michael Niedermayer
5ae140c04f avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 04:52:52 +01:00
James Almer
92d903afaa x86/vp9dsp: fix clobbering of xmm6 on IDCT sse2 functions 
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-02-08 00:50:39 -03:00
Georg Lippitsch
62ea5ae2b5 avdevice/decklink_common: Fix Decklink for Mac 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 04:43:54 +01:00
Georg Lippitsch
97a27065c8 avdevice/decklink: 10 Bit support for Decklink input device 
Example to capture video clip at 1080i50 10 bit:
ffmpeg -bm_v210 1 -f decklink -i 'UltraStudio Mini Recorder@11' -acodec copy -vcodec copy output.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 04:31:27 +01:00
Mark Reid
6a8a3bfb87 libavformat/mxfenc.c: added mxf opatom muxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 03:53:37 +01:00
Michael Niedermayer
7c148f30f3 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Support decoding yuv dpx images.
  Do not use -mdynamic-no-pic on OSX x86_64.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 02:36:23 +01:00
Michael Niedermayer
2048126ea7 avcodec/utils: Assert that dst->progress is clear before ff_thread_ref_frame() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 02:27:27 +01:00
Michael Niedermayer
de6df46120 avcodec/h264: Setup decoder to have matching reference to the EC code 
Also move EC ref initialization to where the EC code is called.
Fixes out of array read
Fixes: asan_heap-uaf_143f420_142_20110805_112659_ch0.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 02:27:27 +01:00
Michael Niedermayer
ecfd48dc06 avcodec/h264: Move COPY_PICTURE() to h264.h so it can be used from other parts of the h264 decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 02:27:27 +01:00
Carl Eugen Hoyos
2efaaf9476 Support decoding yuv dpx images. 2015-02-08 00:12:46 +01:00
Carl Eugen Hoyos
ea329b60f5 Do not use -mdynamic-no-pic on OSX x86_64. 
Fixes default compilation with icc.
 2015-02-08 00:11:13 +01:00
Michael Niedermayer
29fd3032cc avformat/omadec: Subtract headersize in timestamp calculation 
Fixes pts/dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 21:16:20 +01:00
Michael Niedermayer
7c2fa13df9 avformat/omadec: only compute timestamps based on bitrate if its set 
Fixes division by zero

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 21:12:56 +01:00
Michael Niedermayer
7474ea7495 Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1' 
* commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1':
  oma: Report a timestamp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 21:01:52 +01:00
Michael Niedermayer
89c7332b38 Merge commit '8029af586fd5a5f2a0803001f9eff386e5545fe2' 
* commit '8029af586fd5a5f2a0803001f9eff386e5545fe2':
  dxva2_hevc: properly fill the scaling list structure

See: b11994593a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 20:54:11 +01:00
Christophe Gisquet
626d6184ce x86: lavc/hevc_mc: fix comments 
The width parameter is now completely at the back, and actually
never used. This helps understanding the actual parameter list.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 20:52:03 +01:00
Paul B Mahol
134e8c73ea avcodec/faxcompr: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-07 17:16:14 +00:00
Christophe Gisquet
97996eff4f hevc/sao: do in-place band filtering when possible 
The copies are only needed when data must be restored, so skip them
when it must not be.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 18:04:25 +01:00
Christophe Gisquet
ed450d4acf x86: lavc: share more constant through defines 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 17:48:14 +01:00
Carl Eugen Hoyos
ac923ed470 lavf/mlv: Only add streams that are supposed to contain frames. 
Fixes ticket #4296.

Reviewed-by: Peter Ross
 2015-02-07 16:23:36 +01:00
Paul B Mahol
ec8ec999f4 avcodec/twinvqdec: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-07 15:19:03 +00:00
Luca Barbato
e352520e3e oma: Report a timestamp 
Reported-By: jb@videolan.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-07 15:36:15 +01:00
Christophe Gisquet
691b7f5e9e lavc/lossless_audiodsp: revert various commits 
Their intent was to make the DSP work with wmalossless pro.
The later was fixed to work with the DSP.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 15:15:19 +01:00
Christophe Gisquet
46e2afa4dc wmalossless: reset lms_update 
It may contain garbage at the end, and zeroing allows using DSP
with longer loops.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 15:14:32 +01:00
Hendrik Leppkes
8029af586f dxva2_hevc: properly fill the scaling list structure 
The scaling list can be specified in either the SPS or PPS.
Additionally, compensate for the diagonal scan permutation applied
in the decoder.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-07 14:33:29 +01:00
Timothy Gu
1de742145f pixdesc: Include more functions in FF_DISABLE_DEPRECATION_WARNINGS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 14:27:13 +01:00
Michael Niedermayer
be1cb1e63a avutil/pixfmt: Clarify meaning of the A/X bit in RGB555 / remove wording about significant bit 
Found-by:wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 13:46:04 +01:00
Michael Niedermayer
dbab5f5984 avutil/pixfmt: Clarify the meaning of the alpha bits in rgb444 and similar formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 13:20:53 +01:00
Michael Niedermayer
088dd0fd4c avutil/pixfmt: Clarify the meaning of the "alpha" bit in rgb555/bgr555 
Found-by: wm4
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 13:14:58 +01:00
Michael Niedermayer
c02b8c4527 avutil/pixfmt: Clarify the meaning of the alpha byte in RGB0 and similar formats 
Found-by: wm4
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 13:04:23 +01:00
Anshul Maheshwari
f05efd42af avcodec/ccaption_dec: Added Debug logs 
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-07 06:01:31 +01:00