summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* vaapi: define a unique pixel format for VA-API (AV_PIX_FMT_VAAPI).Gwenole Beauchesne2015-08-1912-11/+42
| | | | | | | | | | Deprecate older VA pixel formats (MOCO, IDCT) as it is now very unlikely to ever be useful in the future. Only keep plain AV_PIX_FMT_VAAPI format that is aliased to the older VLD variant. This is an API change. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
* avcodec/qsvenc: Added PicTiming SEISven Dueking2015-08-193-0/+5
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat/matroskaenc.c: fix small memory leaks on errorNeil Birkbeck2015-08-191-23/+44
| | | | | | | | | Fixing small leaks that can occur when mkv_write_tracks fails in mkv_write_header (e.g., if video track has unknown codec). Also changing mkv_write_seekhead to take the MatroskaMuxContext to avoid having dangling pointers. Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_histogram: make it possible to pick color components for levels modePaul B Mahol2015-08-192-4/+19
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.Ronald S. Bultje2015-08-183-3/+4
|
* fate: Force simple idct for fate-asf-repldataMichael Niedermayer2015-08-192-15/+15
| | | | | | otherwise it can fail when a different idct is used on some platform Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/indevs: fix fbdev typosLou Logan2015-08-181-2/+2
| | | | | | | Fixes ticket #4784 as found by rodarmor. Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* swscale: Fixed typosPedro Arthur2015-08-181-2/+2
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale: fixed compiler warningsPedro Arthur2015-08-183-16/+25
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale: add license headers and copyrightsPedro Arthur2015-08-182-0/+40
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libx264: Add option to force IDR framesDerek Buitenhuis2015-08-182-2/+5
| | | | | | | | | Currently, when forcing an I frame, via API, or via the ffmpeg cli, using -force_key_frames, we still let x264 decide what sort of keyframe to user. In some cases, it is useful to be able to force an IDR frame, e.g. for cutting streams. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* lavu: disable wrong value check in get_version() upon api bump.Ronald S. Bultje2015-08-181-0/+2
|
* lavc: move vdpau decoders under FF_API_VDPAU.wm42015-08-186-12/+22
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* lavc: put remaining bits of vdpau-in-decoder under FF_API_CAP_VDPAU.Ronald S. Bultje2015-08-1810-17/+78
|
* Prepare for removal of obsolete FF_IDCT_* members.Ronald S. Bultje2015-08-183-4/+2
|
* mpeg4video: use ff_dlog instead of av_log under debug&FF_DEBUG_PTS.Ronald S. Bultje2015-08-181-3/+2
| | | | This fixes compilation with FF_API_UNUSED_MEMBERS=0.
* configure: force -mconsole when linking SDL under MinGWStephen Hutchinson2015-08-181-0/+3
| | | | | | | | | | | | | | | | When building SDL with MinGW, it sets -mwindows with the assumption that the application is a GUI application. If this is linked without passing -mconsole to configure via --extra-ldflags, stdout will be silenced from cmd.exe while running FFmpeg. The -mwindows flag that causes this behavior is included in the sdl_libs variable, so append -mconsole there rather than create an sdl_ldflags case just to insert it (especially if -mconsole must come *after* -mwindows in order to be effective). Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Undeprecate av_opt_set_defaults2().Ronald S. Bultje2015-08-182-7/+10
|
* lavc: fix compilation with FF_API_XVMC.Ronald S. Bultje2015-08-183-12/+0
|
* options: mark av_get_{int,double,q} as deprecated.Ronald S. Bultje2015-08-183-9/+15
| | | | Convert last users to av_opt_get_*() counterparts.
* libvpxenc: make flags i64 instead of dbl.Ronald S. Bultje2015-08-181-2/+2
|
* FF_OPT_TYPE_* -> AV_OPT_TYPE_*.Ronald S. Bultje2015-08-1810-22/+22
|
* Replace av_dlog with ff_dlog.Ronald S. Bultje2015-08-1819-47/+65
| | | | | ff_dlog checks compilability, and is non-public. av_dlog is deprecated and no longer exists if FF_API_DLOG=0.
* lavfi: add error message to help users convert to new lavfi syntax.Ronald S. Bultje2015-08-182-1/+15
|
* scale2ref: override request_frame() and correctly connect them to the ↵Michael Niedermayer2015-08-181-0/+12
| | | | | | corresponding inputs Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_scale: Set scale2ref ref output timebaseMichael Niedermayer2015-08-181-0/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Move ff_dlog from lavc to lavu.Ronald S. Bultje2015-08-182-6/+6
|
* configure: Use pkg-config for libkvazaar.Arttu Ylä-Outinen2015-08-181-1/+1
| | | | | | Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi> Liked-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '317cfaa5e09755ed0b34af512ec687963a67bdbf'Hendrik Leppkes2015-08-181-2/+4
|\ | | | | | | | | | | | | * commit '317cfaa5e09755ed0b34af512ec687963a67bdbf': asfdec: prevent the memory leak in the asf_read_metada_obj Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * asfdec: prevent the memory leak in the asf_read_metada_objAlexandra Hájková2015-08-161-2/+4
| | | | | | | | | | | | | | also do not return the error code but just break reading metadata object in the case of the aspect ratio reading failure Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33'Hendrik Leppkes2015-08-182-0/+20
|\ \ | |/ | | | | | | | | | | | | | | * commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33': fate: Make sure a corner-case for ASF is covered Adjusted fate ref to match the different timebase of the ffasf demuxer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * fate: Make sure a corner-case for ASF is coveredAlexandra Hájková2015-08-162-0/+20
| | | | | | | | | | | | | | | | | | Test the demuxer for the case when the replicated data length in a sample is 0. Sample-ID: https://samples.libav.org/mplayer-bugs/bug821/bug821-2.asf Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '72839fce6457fdb5d51b4a5381ac52914ee66389'Hendrik Leppkes2015-08-180-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '72839fce6457fdb5d51b4a5381ac52914ee66389': hlsenc: Use AV_TIME_BASE units for all the computations Not merged, duration/time computation is handled quite differently in ffmpeg's hlsenc Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hlsenc: Use AV_TIME_BASE units for all the computationsLuca Barbato2015-08-161-13/+15
| | | | | | | | | | | | | | | | Do not risk mixing different timebases. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b'Hendrik Leppkes2015-08-181-0/+4
|\ \ | |/ | | | | | | | | | | | | | | * commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b': vp7: bound checking in vp7_decode_frame_header Only partially merged, see 46f72ea507afee6adb0d2324848159063d0e7afc Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vp7: bound checking in vp7_decode_frame_headerFederico Tomassetti2015-08-161-0/+8
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1'Hendrik Leppkes2015-08-181-11/+6
|\ \ | |/ | | | | | | | | | | * commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1': libfdk-aacdec: Clean up properly if the init fails Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libfdk-aacdec: Clean up properly if the init failsMartin Storsjö2015-08-161-11/+6
| | | | | | | | | | | | | | | | | | Previously most of the error paths leaked. Also add FF_CODEC_CAP_INIT_THREADSAFE while adding caps_internal; this decoder wrapper doesn't have any static data that is initialized. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1b90433f79de857550d4d8c35c89fbe954920594'Hendrik Leppkes2015-08-181-46/+17
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '1b90433f79de857550d4d8c35c89fbe954920594': libfdk-aacdec: Always decode into an intermediate buffer Conflicts: libavcodec/libfdk-aacdec.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libfdk-aacdec: Always decode into an intermediate bufferMartin Storsjö2015-08-161-50/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For ADTS streams, the output format (number of channels, frame size) can change at any point (with the latest version of fdk-aac, the decoder seems to change format after a handful of frames, not outputting the right format immediately, for cases that worked fine with the earlier version of the lib). Previously, the decoder decoded straight into the output frame once the number of channels and frame size was known. This obviously does not work if the number of channels or frame size changes. The alternative would be to allocate the AVFrame with the maximum number of channels and frame size, and change them afterward decoding into it, but that may cause confusion to users e.g. of the get_buffer callback. This solution should be more robust. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855'Hendrik Leppkes2015-08-181-1/+1
|\ \ | |/ | | | | | | | | | | * commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855': libfdk-aacdec: Bump the max number of channels to 8 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libfdk-aacdec: Bump the max number of channels to 8Martin Storsjö2015-08-161-1/+1
| | | | | | | | | | | | | | | | | | In the latest version of fdk-aac, the decoder can output up to 8 channels; take this into account when preallocating buffers that need to fit the output from any packet. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3'Hendrik Leppkes2015-08-181-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3': configure: arm: Assume softfp ABI on darwin Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * configure: arm: Assume softfp ABI on darwinMartin Storsjö2015-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to detect the float ABI by checking at the toolchain name or by trying to assemble and link files with eabi_attributes. This fixes the float ABI detection when building using clang with -fembed-bitcode, where the current eabi_attributes check accidentally passes. This issue was pointed out by James Howe <james.howe@hp.com>. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '44b44441203177690305c294be6eff8d9c668954'Hendrik Leppkes2015-08-180-0/+0
|\ \ | |/ | | | | | | | | | | * commit '44b44441203177690305c294be6eff8d9c668954': x86inc: Various minor backports from x264 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * x86inc: Various minor backports from x264Henrik Gramner2015-08-131-11/+21
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33'Hendrik Leppkes2015-08-182-9/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33': movenc: Add a new flag for writing global sidx indexes for dash Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: Add a new flag for writing global sidx indexes for dashMartin Storsjö2015-08-122-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The double meaning of the faststart flag (moving a moov atom to the start of files, making them streamable, for non-fragmented files, vs inserting a global sidx index at the start of files for fragmented files) is confusing - see 40ed1cbf1 for explanation of its origins. Since the second meaning of the flag hasn't been part of any libav release yet, just rename it to get rid of the confusion without any extra deprecation (which wouldn't get rid of the potential confusion, of users adding -movflags faststart even for fragmented files, where it isn't needed for making them "streamable"). This gets back the old behaviour, where -movflags faststart doesn't have any effect for fragmented files. Signed-off-by: Martin Storsjö <martin@martin.st>
* | swscale: process horizontal lines in batchesPedro Arthur2015-08-183-16/+49
| | | | | | | | | | | | Process more lines in a single pass to improve performance Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale: refactor horizontal scalingPedro Arthur2015-08-187-11/+751
| | | | | | | | | | | | | | + split color conversion from scaling - disabled gamma correction, until it's refactored too Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
View Lorry Controller Status