RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
41,400 Commits 36 Branches 392 Tags 310 MiB
Commit Graph

23 Commits

Author SHA1 Message Date
Michael Niedermayer e37f161e66 Merge remote-tracking branch 'qatar/master' 
* 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-28 07:53:34 +01:00
Diego Biurrun 299ab0fd17 libavutil: Remove pointless file test program. 2012-01-26 22:44:37 +01:00
Michael Niedermayer fd6af5375b av_tempfile: dont try the current directory with mkstemp() unless we are on windows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 22:32:41 +02:00
Michael Niedermayer e8e13358ad av_tempfile: change mode for fallback to 0600 to match mkstemp() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 22:13:20 +02:00
Michael Niedermayer 74dbb5388e av_tempfile: Pass int log_offset, void *log_ctx 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 21:51:28 +02:00
Michael Niedermayer 482aabd59a av_tempfile: fix error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 21:51:28 +02:00
Michael Niedermayer 4105335c98 av_tempfile: use O_EXCL 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 21:51:28 +02:00
Michael Niedermayer 797c2ef970 av_tempfile: try tempnam(NULL) first 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 21:51:28 +02:00
Michael Niedermayer 5746f91036 av_tempfile: handle missing O_BINARY 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 17:12:37 +02:00
Michael Niedermayer c9833fc33a av_tempfile: fix alloc type for !HAVE_MKSTEMP 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 17:12:37 +02:00
Michael Niedermayer 885158c887 Move av_tempfile() into libavutil, it is a generically usefull thing and its small. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 17:12:37 +02:00
Michael Niedermayer 976a8b2179 Merge remote-tracking branch 'qatar/master' 
* 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-04 00:45:21 +02:00
Mans Rullgard abc78a5a7c Do not include log.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:07 +01:00
Mans Rullgard d0989bed22 Fix error check in av_file_map() 
On failure, mmap() returns MAP_FAILED, which may or may not be -1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-04 17:03:25 +01:00
Reimar Döffinger 314374e579 Use MAP_FAILED to check for mmap failure instead of manually 
recreating the value.
 2011-05-07 10:34:55 +02:00
Michael Niedermayer 10ff2967ea file: Fix mmap error check. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 00:52:03 +02:00
Michael Niedermayer efb5fa79f5 Merge remote branch 'qatar/master' 
* 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-20 04:48:23 +02:00
Anton Khirnov 490a022d86 lavu: remove misc disabled cruft 2011-04-19 19:04:28 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Daniel Verkamp 73f6d31e6c Win32 support for av_file_map() 
Originally committed as revision 26221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 05:16:33 +00:00
Stefano Sabatini f02cbc4590 Fix av_file_map(): replace stat(filename, &st) with fstat(fd, &st). 
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-22 16:16:31 +00:00
Stefano Sabatini 1b31037d62 Replace lstat() with stat() in av_file_map(). The lstat() use was wrong. 
Originally committed as revision 26074 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-22 15:32:13 +00:00
Stefano Sabatini 0328b9ea39 Add av_file_map() and av_file_unmap() functions. 
Originally committed as revision 26073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-22 14:13:04 +00:00