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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-16Merge remote-tracking branch 'origin/master' into combinedrogerdpack
2013-02-02lavd/alsa: simplify reordering functions definition.Nicolas George
2013-01-31lavd/v4l2: read the correct time per frame from devices that support a standardGiorgio Vazzana
Generally speaking, there are two types of v4l2 devices [1]: 1) devices that support a standard, like PAL or NTFS (tv cards, for example). For this class of devices the framerate is fixed by the standard (for example PAL uses 25 fps) and the v4l2 driver cannot usually negotiate a different framerate (unless it can skip frames on the driver side, to save I/O bandwidth). 2) devices for which the notion of standard does not make sense (webcams, for example). For these devices it is usually possibile to request a desidered framerate. In either case, the desidered frame rate can be requested when the VIDIOC_G_PARM ioctl returns the V4L2_CAP_TIMEPERFRAME flag in the capability field. Currently the code does not check for V4L2_CAP_TIMEPERFRAME and supports only the second category of devices, returning a time per frame of 0/0 for devices in the first group that do not permit to negotiate the framerate. This patch adds support to read the correct framerate in all cases. [1] http://linuxtv.org/downloads/v4l-dvb-apis/standard.html Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-31lavd/v4l2: add list_standards optionGiorgio Vazzana
Since the user is expected to choose the standard by name (with -standard option), add the possibility to list all the supported standards. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-28lavd/v4l2: use avcodec_find_decoder in list_formatsStephan Hilb
Because libavdevice/v4l2 is a demuxer, it makes sense to look for decoders instead of encoders when listing the formats supported by the device. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-27lavd/v4l2: select input immediately after opening the deviceGiorgio Vazzana
After opening the device, the first thing we should do is selecting the input. This is because the image formats (VIDIOC_ENUM_FMT ioctl) and the standards (VIDIOC_ENUMSTD ioctl) supported may depend on the selected input ([1] and [2]). [1] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enum-fmt.html [2] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enumstd.html Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-27lavd/v4l2: sanitize logic of device_try_init(), so that it properly signal ↵Stefano Sabatini
errors Make device_try_init() return an error value, and allow to properly report errors which are not due to a wrong pixel/codec configuration. In particular, report intelligible feedback in case of busy device.
2013-01-18Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'Michael Niedermayer
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f': lavc: support ZenoXVID custom tag libcdio: support recent cdio-paranoia float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window theora: Skip zero-sized headers Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16lavd/v4l2: init return value.Nicolas George
Fix a warning and random failures.
2013-01-16lavd/v4l2: update broken link to v4l2 video capture exampleStephan Hilb
Reviewed-by: Stefano Sabatini
2013-01-16lavd/v4l2: improve debug messageStephan Hilb
Reviewed-by: Stefano Sabatini
2013-01-16hdyc colrogerdpack
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2013-01-16dshow: use standardized raw pixel format lookuprogerdpack
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2013-01-16lavd/v4l2: apply grammar/consistency fixes to options help fieldsStefano Sabatini
2013-01-16lavd/v4l2: return meaningful error code from device_init()Stefano Sabatini
In particular, propagate errno value in case of device init failure.
2013-01-16lavd/v4l2: fix misc messagesStefano Sabatini
2013-01-16lavd/v4l2: extend error/debug feedback in case of invalid codec/pix_fmtStefano Sabatini
2013-01-14Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'Michael Niedermayer
* commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1': avpacket: free side data in av_free_packet(). v4l2: do not assert on a value received from outside of Libav v4l2: set the average framerate instead of codec timebase. Conflicts: libavcodec/avpacket.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'Michael Niedermayer
* commit '246da0b13551b1f80f067e4f258e5bd691f5ab33': v4l2: avoid pointless indirection. vdpau: Add VC-1 decoding via hwaccel infrastructure vdpau: Add H.264 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-13v4l2: do not assert on a value received from outside of LibavAnton Khirnov
2013-01-13v4l2: set the average framerate instead of codec timebase.Anton Khirnov
Codec timebase is supposed to be set by decoders only.
2013-01-13v4l2: avoid pointless indirection.Anton Khirnov
v4l2_read_header() does no cleanup, so it can return directly, without any need for goto.
2013-01-04Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'Michael Niedermayer
* commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8': aviobuf: Partial support for reading in read/write contexts build: Avoid detecting bogus components named 'x' Conflicts: libavcodec/allcodecs.c libavdevice/alldevices.c libavformat/allformats.c libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-03build: Avoid detecting bogus components named 'x'Clément Bœsch
The function find_things() in configure is confused by component registration calls as part of multiline macros defining combined component registration. Coalesce those macros into one line to work around the issue. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Martin Storsjö <martin@martin.st>
2012-12-30Merge back some registering macros in all*.c.Clément Bœsch
This breaks the sed in configure:find_things(). Fixes regression from c73c87b. Fixes Ticket2079. Found-by: jamal
2012-12-29bktr: fix warning: missing braces around initializerMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: cosmetics: Prettyprint codec/format/filter registration files Conflicts: libavcodec/allcodecs.c libavdevice/alldevices.c libavfilter/allfilters.c libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28cosmetics: Prettyprint codec/format/filter registration filesDiego Biurrun
2012-12-21Support H264 over video4linux2.Carl Eugen Hoyos
Tested-by: Val Malykh
2012-12-21miscellaneous typo fixesDiego Biurrun
2012-12-17dshow: call CoUninitialize() on dshow_read_close()Ramiro Polla
Every call to CoInitialize should have a matching CoUnititalize. Based on patch by Don Moir <donmoir@comcast.net>.
2012-12-17dshow: handle events in graphRamiro Polla
Handling DirectShow events prevents infinite loops when there is an error in the graph, such as a device being disconnected. This makes it possible for dshow to return an error to the caller and run the cleanup code. Based on patch by Don Moir <donmoir@comcast.net>.
2012-12-15lavd/dshow: rename dshow class namerogerdpack
Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-09dshow: fix return code when opening deviceRamiro Polla
Successfully opening a device altered the ret variable, making the function not cleanup properly and return an incorrect value for errors that happened afterwards. Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06lavd/lavfi: fix float.h include.Clément Bœsch
float.h is a system header.
2012-12-05Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05Remove pointless #undefs of previously forbidden functions.Anton Khirnov
2012-12-01lavu/opt: allow to set sample and pixel format with av_opt_set_int()Stefano Sabatini
This change requires the user to specify min and max value, and makes possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if forbidden. Add required ifdeffery in case of mixed libraries, when libavutil is updated but not the other libraries. This is a followup of 08d0969c1402ccec4dce44bd430128fb59d7b790.
2012-11-30lavu/opt: change the way default pixel and sample format value is setStefano Sabatini
Use the i64 field rather than the string value. Using a string to set a default sample/pixel format is weird, also the new interface is more consistent with the rest of the API. This is technically an API break, but hopefully there are no applications using this feature outside of FFmpeg. In order to save backward compatibility with mixed libraries in case libavutil is updated but not the other libraries, some ifdeffery hacks are added. Note that the version check is only performed when class->version != 0, since if it is not defined then we assume that no version was defined and the class is not affected by the change. We will luckily get rid of the hack at the next major bump.
2012-11-16dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusionsAlexander Strasser
Move the NO_DSHOW_STRSAFE macro definition in front of the dshow.h system header inclusion. This excludes the usage of the STRSAFE functions consistently. Further background on this can be found in the commit message of revision 05ee0db1 where the #define was initially introduced. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2012-11-13Update iec61883 to handle multiple devices, and allowGeorg Lippitsch
selection of DV device by its GUID
2012-11-13Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.hPaul B Mahol
Also remove it in once case when it is not needed. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-12Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-11Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles
Also reorder some other #include when applicable.
2012-11-05oss: warn when non block mode cannot be enabled.Michael Niedermayer
Fixes CID732183 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-02dv1394: Swap the min and max values of the 'standard' optionMichael Niedermayer
DV1394_NTSC has a lower value than DV1394_PAL. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-11-02dv1394: fix order of AVOption fieldsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30x11grab: fix mixed declaration and codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25lavd/lavfi: fix leak in case of failureStefano Sabatini
Jump to the common release code in case of failure.
2012-10-24lavd/lavfi: add graph_file optionStefano Sabatini
Allow to specify a filename where to put the filtergraph description. This is useful to override limitations or glitches of particular shell environments, and allows a level of indirection for specifying filtergraphs.