summaryrefslogtreecommitdiff
path: root/libavdevice
Commit message (Collapse)AuthorAge
* Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'Michael Niedermayer2013-01-18
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * libcdio: support recent cdio-paranoiaLuca Barbato2013-01-17
| | | | | | | | | | Upstream decided to split the paranoia interface and move the headers accordingly.
* | lavd/v4l2: init return value.Nicolas George2013-01-16
| | | | | | | | Fix a warning and random failures.
* | lavd/v4l2: update broken link to v4l2 video capture exampleStephan Hilb2013-01-16
| | | | | | | | Reviewed-by: Stefano Sabatini
* | lavd/v4l2: improve debug messageStephan Hilb2013-01-16
| | | | | | | | Reviewed-by: Stefano Sabatini
* | lavd/v4l2: apply grammar/consistency fixes to options help fieldsStefano Sabatini2013-01-15
| |
* | lavd/v4l2: return meaningful error code from device_init()Stefano Sabatini2013-01-15
| | | | | | | | In particular, propagate errno value in case of device init failure.
* | lavd/v4l2: fix misc messagesStefano Sabatini2013-01-15
| |
* | lavd/v4l2: extend error/debug feedback in case of invalid codec/pix_fmtStefano Sabatini2013-01-15
| |
* | Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'Michael Niedermayer2013-01-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * v4l2: do not assert on a value received from outside of LibavAnton Khirnov2013-01-13
| |
| * v4l2: set the average framerate instead of codec timebase.Anton Khirnov2013-01-13
| | | | | | | | Codec timebase is supposed to be set by decoders only.
* | Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'Michael Niedermayer2013-01-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * v4l2: avoid pointless indirection.Anton Khirnov2013-01-13
| | | | | | | | | | v4l2_read_header() does no cleanup, so it can return directly, without any need for goto.
* | Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'Michael Niedermayer2013-01-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * build: Avoid detecting bogus components named 'x'Clément Bœsch2013-01-03
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge back some registering macros in all*.c.Clément Bœsch2012-12-30
| | | | | | | | | | | | | | This breaks the sed in configure:find_things(). Fixes regression from c73c87b. Fixes Ticket2079. Found-by: jamal
* | bktr: fix warning: missing braces around initializerMichael Niedermayer2012-12-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Prettyprint codec/format/filter registration filesDiego Biurrun2012-12-28
| |
| * miscellaneous typo fixesDiego Biurrun2012-12-21
| |
* | Support H264 over video4linux2.Carl Eugen Hoyos2012-12-21
| | | | | | | | Tested-by: Val Malykh
* | dshow: call CoUninitialize() on dshow_read_close()Ramiro Polla2012-12-17
| | | | | | | | | | | | Every call to CoInitialize should have a matching CoUnititalize. Based on patch by Don Moir <donmoir@comcast.net>.
* | dshow: handle events in graphRamiro Polla2012-12-17
| | | | | | | | | | | | | | | | 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>.
* | lavd/dshow: rename dshow class namerogerdpack2012-12-15
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | dshow: fix return code when opening deviceRamiro Polla2012-12-08
| | | | | | | | | | | | | | | | | | 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>
* | lavd/lavfi: fix float.h include.Clément Bœsch2012-12-06
| | | | | | | | float.h is a system header.
* | Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer2012-12-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Remove pointless #undefs of previously forbidden functions.Anton Khirnov2012-12-04
| |
* | lavu/opt: allow to set sample and pixel format with av_opt_set_int()Stefano Sabatini2012-12-01
| | | | | | | | | | | | | | | | | | | | | | 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.
* | lavu/opt: change the way default pixel and sample format value is setStefano Sabatini2012-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusionsAlexander Strasser2012-11-16
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Update iec61883 to handle multiple devices, and allowGeorg Lippitsch2012-11-13
| | | | | | | | selection of DV device by its GUID
* | Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.hPaul B Mahol2012-11-13
| | | | | | | | | | | | Also remove it in once case when it is not needed. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-11
| | | | | | | | Also reorder some other #include when applicable.
| * dv1394: Swap the min and max values of the 'standard' optionMichael Niedermayer2012-11-02
| | | | | | | | | | | | DV1394_NTSC has a lower value than DV1394_PAL. Signed-off-by: Martin Storsjö <martin@martin.st>
* | oss: warn when non block mode cannot be enabled.Michael Niedermayer2012-11-05
| | | | | | | | | | Fixes CID732183 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dv1394: fix order of AVOption fieldsMichael Niedermayer2012-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x11grab: fix mixed declaration and codeMichael Niedermayer2012-10-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/lavfi: fix leak in case of failureStefano Sabatini2012-10-25
| | | | | | | | Jump to the common release code in case of failure.
* | lavd/lavfi: add graph_file optionStefano Sabatini2012-10-23
| | | | | | | | | | | | | | | | 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.
* | x11: Fix x11grab BadCursorIsaac Dooley2012-10-23
| | | | | | | | | | | | | | | | Fixes Ticket1738 Based-on: A fix found in a perl module (http://ffmpeg.org/pipermail/ffmpeg-user/2012-August/008804.html) Reviewed-by: Clemens Fruhwirth <clemens@endorphin.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: add lavfi metadata support.Clément Bœsch2012-10-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a new AVPacket side data type: AV_PKT_DATA_STRINGS_METADATA. Its main goal is to provide a way to transmit the metadata from the AVFilterBufferRef up to the AVFrame. This is at the moment "only" useful for lavfi input from libavdevice: lavd/lavfi only outputs packets, and the metadata from the buffer ref kept in its context needs to be transmitted from the packet to the frame by the decoders. The buffer ref can be destroyed at any time (along with the metadata), and a duplication of the AVPacket needs to duplicate the metadata as well, so the choice of using the side data to store them was selected. Making sure lavd/lavfi raises the metadata is useful to allow tools like ffprobe to access the filters metadata (it is at the moment the only way); ffprobe will now automatically show the AVFrame metadata in any customizable output format for users. API users will also be able to access the AVFrame->metadata pointer the same way ffprobe does (av_frame_get_metadata). All the changes are done in this single commit to avoid some memory leaks: for instances, the changes in lavfi/avcodec.c are meant to duplicate the metadata from the buffer ref into the AVFrame. Unless we have an internal way of freeing the AVFrame->metadata automatically, it will leak in most of the user apps. To fix this problem, we introduce AVCodecContext->metadata and link avctx->metadata to the current frame->metadata and free it at each decode frame call (and in the codec closing callback for the last one). But doing this also means to update the way the tiff decoder already handles the AVFrame->metadata (it's the only one decoder with frame metadata at the moment), by making sure it is not trying to free a pointer already freed by the lavc internals. The lavfi/avcodec.c buffer ref code is based on an old Thomas Kühnel work, the rest of the code belongs to the commit author. Signed-off-by: Thomas Kühnel <kuehnelth@googlemail.com> Signed-off-by: Clément Bœsch <ubitux@gmail.com>
* | caca: fix 10l typoMichael Niedermayer2012-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd: do not use av_pix_fmt_descriptors directlyPaul B Mahol2012-10-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | * qatar/master: lavu,lavd: do not use av_pix_fmt_descriptors directly. Conflicts: libavutil/imgutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu,lavd: do not use av_pix_fmt_descriptors directly.Anton Khirnov2012-10-12
| |
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-08
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 01:27:17 +0000