summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avutil/libm: fix isnan compatibility hackGanesh Ajjanagadde2015-11-241-1/+1
| | | | | | | | | | | | | Commit 14ea4151d7c3c26500193f11ac661ed20c7c2b9c had a bug in that the conversion of the uint64_t result to an int (the return signature) would lead to implementation defined behavior, and in this case simply returned 0 for NAN. A fix via AND'ing the result with 1 does the trick, simply by ensuring a 0 or 1 return value. Patch tested with FATE on x86-64, GNU/Linux by forcing the compatibility code via an ifdef hack suggested by Michael. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* doc/indevs: Fix GermanTimothy Gu2015-11-241-1/+1
|
* configure: Fix pseudo-GermanTimothy Gu2015-11-241-1/+1
|
* avfilter/vsrc_mandelbrot: change sin to sinf for color computationGanesh Ajjanagadde2015-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | lrintf is anyway used, suggesting we only care up to floating precision. Rurthermore, there is a compat hack in avutil/libm for this function, and it is used in avcodec/aacps_tablegen.h. This yields a non-negligible speedup. Sample benchmark: x86-64, Haswell, GNU/Linux: old (draw_mandelbrot): 274635709 decicycles in draw_mandelbrot, 256 runs, 0 skips 300287046 decicycles in draw_mandelbrot, 512 runs, 0 skips 371819935 decicycles in draw_mandelbrot, 1024 runs, 0 skips 336663765 decicycles in draw_mandelbrot, 2048 runs, 0 skips 581851016 decicycles in draw_mandelbrot, 4096 runs, 0 skips new (draw_mandelbrot): 269882717 decicycles in draw_mandelbrot, 256 runs, 0 skips 296359285 decicycles in draw_mandelbrot, 512 runs, 0 skips 370076599 decicycles in draw_mandelbrot, 1024 runs, 0 skips 331478354 decicycles in draw_mandelbrot, 2048 runs, 0 skips 571904318 decicycles in draw_mandelbrot, 4096 runs, 0 skips Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avfilter/vsrc_mandelbrot: avoid sqrt for epsilon calculationGanesh Ajjanagadde2015-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This rewrites into a similar expression avoiding sqrt. Similarity is assured since sqrt(x^2 + y^2)/(x+y) lies in [1/sqrt(2), 1] for x, y > 0. Tested on x86-64, Haswell, GNU/Linux. Command: ffmpeg -f lavfi -i mandelbrot -f null - old (draw_mandelbrot): 277625266 decicycles in draw_mandelbrot, 256 runs, 0 skips 304527322 decicycles in draw_mandelbrot, 512 runs, 0 skips 377593582 decicycles in draw_mandelbrot, 1024 runs, 0 skips 338539499 decicycles in draw_mandelbrot, 2048 runs, 0 skips 583630357 decicycles in draw_mandelbrot, 4096 runs, 0 skips new (draw_mandelbrot): 274635709 decicycles in draw_mandelbrot, 256 runs, 0 skips 300287046 decicycles in draw_mandelbrot, 512 runs, 0 skips 371819935 decicycles in draw_mandelbrot, 1024 runs, 0 skips 336663765 decicycles in draw_mandelbrot, 2048 runs, 0 skips 581851016 decicycles in draw_mandelbrot, 4096 runs, 0 skips Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/aacps_tablegen: use hypot()Ganesh Ajjanagadde2015-11-241-1/+1
| | | | | Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/aacps_tablegen_template: replace #define by typedefGanesh Ajjanagadde2015-11-241-2/+2
| | | | | | | See e.g https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c for rationale. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/aac_defines: replace #define by typedefGanesh Ajjanagadde2015-11-241-10/+10
| | | | | | | See e.g https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c for rationale. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* vsrc_mandelbrot: Don't use German in commentsTimothy Gu2015-11-241-1/+1
|
* lavfi/select: add support for concatdec_select optionMarton Balint2015-11-252-0/+53
| | | | | | | | | This option can be used to select useful frames from an ffconcat file which is using inpoints and outpoints but where the source files are not intra frame only. Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: add option for adding segment start time and duration metadataMarton Balint2015-11-252-0/+18
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: simplify duration calculation in open_next_fileMarton Balint2015-11-251-7/+2
| | | | | | | | If duration is still AV_NOPTS_VALUE when opening the next file, we can assume that outpoint is not set. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: calculate duration early if outpoint is knownMarton Balint2015-11-251-0/+2
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* avcodec/h264_slice: Limit max_contexts when slice_context_count is initializedMichael Niedermayer2015-11-241-0/+1
| | | | | | | | Fixes out of array access Fixes: 1430e9c43fae47a24c179c7c54f94918/signal_sigsegv_421427_2049_f2192b6829ab6e0eefcb035329c03c60.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'fb8753ada23189076bdf903c1c001c0ca8287fae'Derek Buitenhuis2015-11-244-28/+17
|\ | | | | | | | | | | | | * commit 'fb8753ada23189076bdf903c1c001c0ca8287fae': qsvenc: factor out common options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvenc: factor out common optionsAnton Khirnov2015-11-204-24/+13
| |
* | avformat/v210: Check width and heightTimothy Gu2015-11-231-12/+9
| | | | | | | | | | Fixes a floating point exception when width and height are not supplied (and therefore are zero).
* | avformat/rawvideodec: Rework packet size calculationTimothy Gu2015-11-231-12/+9
| | | | | | | | | | | | Calculate packet size only once, and propagate errors earlier in the chain. Also remove use of the deprecated av_image_get_buffer_size().
* | imgutils: Use designated initializers for AVClassTimothy Gu2015-11-231-2/+12
| | | | | | | | More readable and less breakable.
* | avfilter/vsrc_mandelbrot: Fix speed regressionMichael Niedermayer2015-11-241-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/rawenc: Recognize more extensions to encode raw hevc.Carl Eugen Hoyos2015-11-241-1/+1
| | | | | | | | Requested-by: Mike Brown, brown at mrvideo vidiot com
* | avcodec/mpegvideo_enc: Remove slice structured mode from H.263 as well as ↵Michael Niedermayer2015-11-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | the code automatically enabing it There is no such thing as a slice structured mode in the original version 1 H.263, that mode was added in H.263+ in 1998. Also the headers for slice structured mode are not part of the older version 1 and this would result in unplayable files An alternative to this patch would be to merge the H263 and H263P AVCodecs and use other means to distinguish the older and newer versions. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc-test: Fix integer overflowsMichael Niedermayer2015-11-232-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/arm: add ff_nv{12,21}_to_{argb,rgba,abgr,bgra}_neonMatthieu Bouron2015-11-234-3/+232
| | | | | | | | | | Signed-off-by: Matthieu Bouron <matthieu.bouron@stupeflix.com> Signed-off-by: Clément Bœsch <clement@stupeflix.com>
* | avutil/x86/bswap: Remove warning about bswap intrinsics with msvc.Matt Oliver2015-11-231-0/+3
| | | | | | | | Signed-off-by: Matt Oliver <protogonoi@gmail.com>
* | avutil/motion_vector: export subpel motion informationClément Bœsch2015-11-235-36/+50
| | | | | | | | FATE test changes because of the switch from shift to division.
* | doc/filters: mention afifoPaul B Mahol2015-11-231-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/af_afade: add missing fifo write for second streamPaul B Mahol2015-11-231-0/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | patcheck: Fix false detection of 'mergeable calls' when line is removedHagen Schmidt2015-11-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Revert "avcodec/dct32_template: fix typo"Ganesh Ajjanagadde2015-11-221-1/+1
| | | | | | | | | | | | This reverts commit 82c5f3178930285f84c42ab4b026ee48d53305ec. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avcodec/dct32_template: fix typoGanesh Ajjanagadde2015-11-221-1/+1
| | | | | | | | | | Found-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avcodec/ppc/fdctdsp: use M_SQRT2 instead of ad-hoc SQRT2Ganesh Ajjanagadde2015-11-221-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | This actually fixes an incorrect float literal. It is believed by examining the precision that the literals were all pre-computed as floats, resulting in this needless loss of precision. There is no benefit to keeping such reduced precision: 1. These constants are used for static array computation, hence compile-time. 2. They will be treated as doubles anyway, since f specifier was not present. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avcodec/dct32_template: use M_SQRT1_2 instead of actual literalGanesh Ajjanagadde2015-11-221-1/+1
| | | | | | | | | | | | Fixed point value remains unchanged. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avcodec/cos_tablegen: use M_PI instead of actual literalGanesh Ajjanagadde2015-11-221-1/+3
| | | | | | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avcodec/ac3: use M_SQRT1_2, M_SQRT2Ganesh Ajjanagadde2015-11-221-3/+3
| | | | | | | | | | | | | | | | | | This uses M_SQRT1_2, M_SQRT2 instead of the actual literals. This yields greater precision in some places in avcodec/ac3, while fixed point values remain unchanged. Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avfilter/vf_fspp: use M_SQRT1_2, M_SQRT2Ganesh Ajjanagadde2015-11-221-3/+3
| | | | | | | | | | | | | | | | This uses M_SQRT1_2, M_SQRT2 instead of the actual literals. Fixed point values remain unchanged. Patch tested with FATE on x86. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avformat/mov: use hypot()Ganesh Ajjanagadde2015-11-221-2/+1
| | | | | | | | | | | | | | This simplifies the code. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avcodec/dvdsubdec: Fix types for offset1/2 in ff_dlog()Michael Niedermayer2015-11-221-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '3edac01f79a08635d8d2c08e9410651d9a330d61'Derek Buitenhuis2015-11-220-0/+0
|\ \ | |/ | | | | | | | | | | * commit '3edac01f79a08635d8d2c08e9410651d9a330d61': qsvenc: fix setting maxrate for VBR Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvenc: fix setting maxrate for VBRAnton Khirnov2015-11-201-1/+1
| |
* | Merge commit '4d8f536b535487063a08609636e712ad86d2ad54'Derek Buitenhuis2015-11-222-0/+266
|\ \ | |/ | | | | | | | | | | * commit '4d8f536b535487063a08609636e712ad86d2ad54': qsvenc: print the actual video parameters used by MSDK Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvenc: print the actual video parameters used by MSDKAnton Khirnov2015-11-202-0/+266
| |
* | Merge commit 'f6c94457b44f41d900cd0991857f54e1f0ccedd6'Derek Buitenhuis2015-11-221-6/+7
|\ \ | |/ | | | | | | | | | | * commit 'f6c94457b44f41d900cd0991857f54e1f0ccedd6': mpegvideo_enc: enable rtp_mode when multiple slices are used Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpegvideo_enc: enable rtp_mode when multiple slices are usedAnton Khirnov2015-11-201-3/+7
| | | | | | | | | | | | | | | | | | | | Currently, multiple slices with just one thread produce corrupted output. Additionally, enable slice structured mode for h263(+) Bug-Id: 912 CC: libav-stabl@libav.org
* | Merge commit 'd80f0a4ad634b3949b91b85f21fd608c0cddeef7'Derek Buitenhuis2015-11-221-0/+6
|\ \ | |/ | | | | | | | | | | * commit 'd80f0a4ad634b3949b91b85f21fd608c0cddeef7': mpevideo_enc: disallow multiple slices for h261 and flv Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpevideo_enc: disallow multiple slices for h261 and flvAnton Khirnov2015-11-201-0/+6
| | | | | | | | | | | | They do not work and produce corrupted output. CC: libav-stable@libav.org
* | Merge commit 'ca489564ae150bc41764f175b88151d883e69ae0'Derek Buitenhuis2015-11-221-4/+15
|\ \ | |/ | | | | | | | | | | * commit 'ca489564ae150bc41764f175b88151d883e69ae0': movenc: add fallback audio track tref support Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * movenc: add fallback audio track tref supportJohn Stebbins2015-11-181-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | This feature allows making associations between audio tracks that apple players recognize. E.g. when an ac3 track has a tref that points to an aac track, devices that don't support ac3 will automatically fall back to the aac track. Apple used to *guess* these associations, but new products (AppleTV 4) no longer guess and this association can only be made explicitly now using the "fall" tref. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '79ae1e630b476889c251fc905687a3831b43ab5e'Derek Buitenhuis2015-11-223-1/+13
|\ \ | |/ | | | | | | | | | | * commit '79ae1e630b476889c251fc905687a3831b43ab5e': avcodec: Define side data type for fallback track Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avcodec: Define side data type for fallback trackJohn Stebbins2015-11-183-1/+13
| | | | | | | | | | | | | | | | | | This side data type is meant to be added to AVStream side data. A fallback track indicates an alternate track to use when the current track can not be decoded for some reason. e.g. no decoder available for codec. Signed-off-by: Anton Khirnov <anton@khirnov.net>
OpenPOWER on IntegriCloud