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
2012-06-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-22lavu/file: include unistd.h only when availableMans Rullgard
The unistd.h header is only needed for the close() declaration. If this header is not available, the close() declaration may be provided by another header, e.g. io.h. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-01-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-27libavutil: Remove pointless file test program.Diego Biurrun
2011-10-17av_tempfile: dont try the current directory with mkstemp() unless we are on ↵Michael Niedermayer
windows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-17av_tempfile: change mode for fallback to 0600 to match mkstemp()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16av_tempfile: Pass int log_offset, void *log_ctxMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16av_tempfile: fix error codesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16av_tempfile: use O_EXCLMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16av_tempfile: try tempnam(NULL) firstMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16av_tempfile: handle missing O_BINARYMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16av_tempfile: fix alloc type for !HAVE_MKSTEMPMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16Move av_tempfile() into libavutil, it is a generically usefull thing and its ↵Michael Niedermayer
small. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04Do not include log.h in avutil.hMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-04Fix error check in av_file_map()Mans Rullgard
On failure, mmap() returns MAP_FAILED, which may or may not be -1. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-07Use MAP_FAILED to check for mmap failure instead of manuallyReimar Döffinger
recreating the value.
2011-05-05file: Fix mmap error check.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-20Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-19lavu: remove misc disabled cruftAnton Khirnov
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-05Win32 support for av_file_map()Daniel Verkamp
Originally committed as revision 26221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-22Fix av_file_map(): replace stat(filename, &st) with fstat(fd, &st).Stefano Sabatini
The file might be replaced between open() and stat(). Spotted by Mans. Originally committed as revision 26075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-22Replace lstat() with stat() in av_file_map(). The lstat() use was wrong.Stefano Sabatini
Originally committed as revision 26074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-22Add av_file_map() and av_file_unmap() functions.Stefano Sabatini
Originally committed as revision 26073 to svn://svn.ffmpeg.org/ffmpeg/trunk