Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-09-03Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'Michael Niedermayer
* commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc': x11grab: Fallback to normal XImage if SHM is not supported Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03x11grab: Refactor pixel format parsingLuca Barbato
2014-09-03x11grab: Fallback to normal XImage if SHM is not supportedLuca Barbato
2014-08-30xv.c: Add missing const to lookup table.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-29Add missing "const" all over the place.Reimar Döffinger
Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-29Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'Michael Niedermayer
* commit '58396e806c65fe0eb00e6ccf1980f810cdceed05': x11grab: Use a typedef for the context, as most other code does Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'Michael Niedermayer
* commit '7bb505a33ca131906b2ceb2f298e104c862740ea': x11grab: Drop a spurious space in the extension reporting message Conflicts: libavdevice/x11grab.c See: 9af209712099699d717596f55b08b3bac8b6b563 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'Michael Niedermayer
* commit '20e82b41fcad23ebbb18d89948aebfcc53921198': x11grab: Small near-cosmetic refactorings Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'Michael Niedermayer
* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8': x11grab: K&R formatting cosmetics Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28x11grab: Use a typedef for the context, as most other code doesLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28x11grab: Drop a spurious space in the extension reporting messageLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28x11grab: Small near-cosmetic refactoringsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28x11grab: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-27bktr: Fix Fabrice's nameTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> This file with the incorrect name was added after the name was fixed in all other files. This is thus fixing a mistake Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27pulse: Set the wallclock option as defaultLuca Barbato
2014-08-26Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'Michael Niedermayer
* commit 'ab56fabe6294524e99815451ad01e4ff50c6d734': vfwcap: Add fallback define for HWND_MESSAGE The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around commit 8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2 vfwcap: Drop fallback VfW defines The defines were added long ago when MinGW still lacked them. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26vfwcap: Add fallback define for HWND_MESSAGEDiego Biurrun
Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.
2014-08-24Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'Michael Niedermayer
* commit '424b929b5cb9ca4094099f25179829260d4b0fa3': pulse: Add a wallclock option to be compatible with other other captures Conflicts: libavdevice/pulse_audio_dec.c wallclock mode was supported and default in FFmpeg already before this commit. its thus left the default Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24pulse: Add a wallclock option to be compatible with other other capturesLuca Barbato
alsa and x11grab use av_gettime() to report timestamps. Bug-Id: 647
2014-08-19Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'Michael Niedermayer
* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2': vfwcap: Drop fallback VfW defines Conflicts: libavdevice/vfwcap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-19gdigrab: fix gdi object leak if using mouserogerdpack
based on patch from hlszl1983@163.com Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-19vfwcap: Drop fallback VfW definesDiego Biurrun
The defines were added long ago when MinGW still lacked them.
2014-08-19lavd/pulse_audio_dec: use default source when no input providedLukasz Marek
PulseAudio expilitly requires name of the source. This patch makes it use default source when not provided. It simplifies programistic use. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-18avdevice/v4l2: try to fix build for openbsdMichael Niedermayer
Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-18lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns ENODATAAndre Wolokita
As of September 14 2012, v4l_enumstd() will return ENODATA when a device's std field is set to 0. That is, the device does not have a standard format. In order to properly handle this case, v4l2_set_parameters should catch the ENODATA code and break instead of failing. Below is the v4l2-core commit describing this change. >>commit a5338190efc7cfa8c99a6856342a77d21c9a05cf >>Author: Hans Verkuil <hans.verkuil@cisco.com> >>Date: Fri Sep 14 06:45:43 2012 -0300 >> >> [media] v4l2-core: tvnorms may be 0 for a given input, handle that case >> >> Currently the core code looks at tvnorms to see whether ENUMSTD >> or G_PARM should be enabled. This is not a good check for drivers >> that support the STD API on one input and the DV Timings API on another. >> In that case tvnorms may be 0. >> Instead check whether s_std is present (for ENUMSTD) or whether g_std or >> current_norm is present for g_parm. >> Also, in the enumstd core function return ENODATA if tvnorms is 0, >> because in that case the current input does not support the STD API >> and ENUMSTD should return ENODATA for that. >> >> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >> Reviewed-by: Sakari Ailus <sakari.ailus@iki.fi> >> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2014-08-15Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2'Michael Niedermayer
* commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2': vfwcap: Replace deprecated av_destruct_packet() by av_free_packet() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-15vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()Diego Biurrun
2014-08-10Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'Michael Niedermayer
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8': Bump major versions of all libraries. Conflicts: doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h libavutil/version.h libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09Bump major versions of all libraries.Anton Khirnov
2014-08-07avdevice/lavfi: Simplify non-AV stream checkMichael Niedermayer
Fixes a clang warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07lavd/dshow: use av_codec_get_id()James Almer
ff_codec_get_id() is a lavf internal function Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07avcodec/raw: add avpriv_get_raw_pix_fmt_tags()James Almer
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()James Almer
The were wrongly being exported and used by libavdevice Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05lavd/avfoundation: Add device category.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but ↵Michael Niedermayer
continue Found-by: CSA and Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31v4l2enc: adding AVClassAnshul Maheswhwari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-28avdevice/pulse_audio_enc: use getter function for AVFrame.channelsMichael Niedermayer
This is required by the API/ABI for things outside libavutil Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23lavd/lavfi: work with non-mappable files for graph_file optionAndrey Utkin
Example of non-mappable file is /dev/stdin. Previously passing it as graph_file value returned error. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'Michael Niedermayer
* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e': oss_audio: Split muxer and demuxer Conflicts: libavdevice/Makefile libavdevice/oss_audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19oss_audio: use a macro to simplify ioctl() error checkingTimothy Gu
Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is available. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19oss_audio: Split muxer and demuxerNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-18Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'Michael Niedermayer
* commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46': avdevice: Give names to anonymously typedeffed structs Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18avdevice: Give names to anonymously typedeffed structsDiego Biurrun
Anonymous structs can cause trouble in header files, so try to avoid them altogether as a matter of good style.
2014-07-17lavd/x11grab: reindent after last commit.Nicolas George
2014-07-17lavd/x11grab: add an option to disable MIT-SHM.Nicolas George
With remote displays supporting the MIT-SHM extension, the extension is detected and used, but attaching fails asynchronously.
2014-07-17lavd/x11grab: check 32-bits color masks.Nicolas George
The X11 servers by VNC, at 32-bits depths, has the following masks: R:0x000007ff G:0x003ff800 B:0xffc00000 This is not compatible with AV_PIX_FMT_0RGB32, and the result is success with completely wrong colors.
2014-07-17lavd/x11grab: change error code for unsupported visuals.Nicolas George
2014-07-17lavd/x11grab: disable drawing mouse without XFixes.Nicolas George
Fix a segfault if the XFixes extension is not available on the X11 server. Can be reproduced using the VNC server.