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
2015-08-08use avfilter_pad_get_{type,name} accessor functionsAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-04lavd/v4l2: Use AVSTREAM_PARSE_FULL_ONCE when reading a h264 stream.Carl Eugen Hoyos
Reported, debugged and tested by trac user noah. Fixes ticket #4644.
2015-07-31dshow: show more debug timestamp inforogerdpack
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-07-28avdevice/decklink: Fix build error caused by a change in the SDK.Chris Spencer
In version 10.4 of the DeckLink SDK, GetBufferedAudioSampleFrameCount() was changed to take an unsigned int instead of an unsigned long. Signed-off-by: Chris Spencer <spencercw@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: Consistently prefix input buffer definesVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-21Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'Michael Niedermayer
* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370': Deprecate avctx.coded_frame Conflicts: ffmpeg.c libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/gif.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/proresenc_kostya.c libavcodec/pthread_frame.c libavcodec/rawenc.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/version.h libavcodec/xbmenc.c libavcodec/xwdenc.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20Deprecate avctx.coded_frameVittorio Giovara
The rationale is that coded_frame was only used to communicate key_frame, pict_type and quality to the caller, as well as a few other random fields, in a non predictable, let alone consistent way. There was agreement that there was no use case for coded_frame, as it is a full-sized AVFrame container used for just 2-3 int-sized properties, which shouldn't even belong into the AVCodecContext in the first place. The appropriate AVPacket flag can be used instead of key_frame, while quality is exported with the new AVPacketSideData quality factor. There is no replacement for the other fields as they were unreliable, mishandled or just not used at all. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-11Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'Michael Niedermayer
* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3': fbdev: Support the RGB565 colour space. Conflicts: libavdevice/fbdev_dec.c See: 43d36599fe3330913c6be9da5519dee048263dc9 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-11fbdev: Support the RGB565 colour space.Dan Flett
Tested on a Raspberry Pi. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-06xcbgrab: Explicitly include xcb/shape.hLuca Barbato
Found-By: Cheristheus
2015-07-01lavd: Add library identifierVittorio Giovara
2015-06-16doc: avoid incorrect phrase 'allows to'Andreas Cadhalpun
Also fix typo found by Lou Logan: Sacrifying -> Sacrificing Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-13Remove a few occurences of "long long" from the libraries.Carl Eugen Hoyos
2015-06-11avdevice/openal-dec: Make al_format_info constMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-10avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'Michael Niedermayer
* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a': jack: Check memory allocation Conflicts: libavdevice/jack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08jack: Check memory allocationVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1292520
2015-06-07avdevice/iec61883: Check pthread init for failuresMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-06avdevice/x11grab: use av_clip() instead of nested min & maxClément Bœsch
Note: [xy]_off and screen_[wh] variables are int, as well as X11GrabContext.{width,height,x_off,y_off}.
2015-05-16avdevice/v4l2: Fix vertical alignment in list_formats() outputMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09avdevice/v4l2: Try to fix build on netbsd/openbsdMichael Niedermayer
Found-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08lavd/v4l2: produce a 0 byte packet when a dequeued buffer is flagged with ↵Giorgio Vazzana
V4L2_BUF_FLAG_ERROR Fixes ticket #4030. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08lavd/v4l2: fix typoGiorgio Vazzana
This was introduced in cde6e328de214ffe8387641cdc1e433a2c2150f3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06lavd/xcbgrab: fix comparison with screen size.Nicolas George
Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06xcbgrab: Accept geometries matching the screen sizeNicolas George
Introduced in e8c4db0d4d077.
2015-04-30Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641'Michael Niedermayer
* commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641': xcbgrab: Validate the capture area Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b'Michael Niedermayer
* commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b': xcbgrab: Do not assume the non shm image data is always available Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30xcbgrab: Validate the capture areaLuca Barbato
And notify why the capture is impossible. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-30xcbgrab: Do not assume the non shm image data is always availableLuca Barbato
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-24lavd/v4l2: print buffer flags in case of errorGiorgio Vazzana
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-22dshow: add capture device save and loadMate Sebok
Signed-off-by: Mate Sebok <smfinc.org@gmail.com> Reviewed-by: Roger Pack <rogerdpack2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'Michael Niedermayer
* commit '386e2755aab73ae7075f78d92786cb5c5419597a': jack: Check memory allocation Conflicts: libavdevice/jack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20jack: Check memory allocationFederico Tomassetti
Bug-Id: CID 1265785 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19Replace av_dlog with normal av_log at trace levelVittorio Giovara
This applies to every library where performance is not critical.
2015-04-11libdc1394: Unbreak build after c201069faMichael Kostylev
2015-04-11Merge commit '4f373a5111f900af54301907132942f95276285c'Michael Niedermayer
* commit '4f373a5111f900af54301907132942f95276285c': vfwcap: Unbreak building after c201069fa Conflicts: libavdevice/vfwcap.c See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11vfwcap: Unbreak building after c201069faMartin Storsjö
These headers can't be included in any arbitrary order. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-10avdevice/vfwcap: revert header reordering from ↵Michael Niedermayer
c201069fac9a76e6604f9d84d76a172434d62200 This should fix build on vs2013 Found-by: Ferdinand Oeinck <ferdo@bigroses.demon.nl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'Michael Niedermayer
* commit '8d26c193fb42d08602ac93ece039d4718d029adc': avdevice: Apply a more consistent file naming scheme Conflicts: libavdevice/Makefile libavdevice/alsa.h libavdevice/alsa_dec.c libavdevice/alsa_enc.c libavdevice/sndio_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09avdevice/vfwcap: put the headers back in the order in which they need to beMichael Niedermayer
This avoids build failures Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'Michael Niedermayer
* commit 'c201069fac9a76e6604f9d84d76a172434d62200': avdevice: Add missing header for NULL_IF_CONFIG_SMALL Conflicts: libavdevice/alsa-audio-dec.c libavdevice/alsa-audio-enc.c libavdevice/pulse_audio_dec.c libavdevice/sndio_enc.c libavdevice/vfwcap.c libavdevice/x11grab.c libavdevice/xcbgrab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09avdevice: Apply a more consistent file naming schemeDiego Biurrun
2015-04-09avdevice: Add missing header for NULL_IF_CONFIG_SMALLDiego Biurrun
Also reshuffle headers into canonical order where appropriate.
2015-03-30avdevice/avfoundation: Fix occured typoMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29libavdevice/avfoundation: use pts/dts provided by the CMSampleBuffer APIMatthieu Bouron
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29libavdevice/avfoundation: add capture_mouse_clicks optionMatthieu Bouron
Support mouse clicks capture while recording a screen on OSX >= 10.7. Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29libavdevice/avfoundation: add capture_cursor optionMatthieu Bouron
Add support for cursor capturing while recording a screen for OSX >= 10.8. Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>