RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-16 12:24:52 +00:00
Code Issues Projects Releases Wiki Activity
4da42ebe44
ffmpeg/libavutil
History
Michael Niedermayer 4da42ebe44 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  MS Screen 1 decoder
  aacdec: Fix popping channel layouts.
  av_gettime: support Win32 without gettimeofday()
  Use av_gettime() in various places
  Move av_gettime() to libavutil
  dct-test: use emms_c() from libavutil instead of duplicating it
  mov: fix operator precedence bug
  mathematics.h: remove a couple of math defines
  Remove unnecessary inclusions of [sys/]time.h
  lavf: remove unnecessary inclusions of unistd.h
  bfin: libswscale: add const where appropriate to fix warnings
  bfin: libswscale: remove unnecessary #includes
  udp: Properly check for invalid sockets
  tcp: Check the return value from getsockopt
  network: Use av_strerror for getting error messages
  udp: Properly print error from getnameinfo
  mmst: Use AVUNERROR() to convert error codes to the right range for strerror
  network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows
  rtmp: Reduce the number of idle posts sent by sleeping 50ms

Conflicts:
	Changelog
	configure
	libavcodec/aacdec.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/dct-test.c
	libavcodec/version.h
	libavformat/riff.c
	libavformat/udp.c
	libavutil/Makefile
	libswscale/bfin/yuv2rgb_bfin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-20 20:47:46 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
avr32
bfin
mips Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h attributes: move av_restrict fallback from internal to attributes 2012-06-17 18:05:31 +02:00
audio_fifo.c avutil: add audio fifo buffer 2012-04-20 09:43:11 -04:00
audio_fifo.h avutil: add audio fifo buffer 2012-04-20 09:43:11 -04:00
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-06-10 21:34:15 +02:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2012-06-18 20:07:00 +02:00
avassert.h
avstring.c
avstring.h
avutil.h avutil: add get_category() for the case where one AVClass can have more than 1 category 2012-06-19 17:22:02 +02:00
base64.c
base64.h
bprint.c bprint: implement vsnprintf for win32. 2012-06-14 13:54:00 +02:00
bprint.h bprint: add av_bprint_init_for_buffer(). 2012-06-07 22:28:32 +02:00
bswap.h
colorspace.h
common.h Fixed warnings about int64 to int32 conversion 2012-05-25 02:41:28 +02:00
cpu.c cmdutils/avutil: Move cpu caps parse code into av_parse_cpu_caps() 2012-04-30 18:31:06 +02:00
cpu.h libavutil: Document the shortcommings of av_parse_cpu_flags() 2012-04-30 18:31:06 +02:00
crc_data.h
crc.c
crc.h
des.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
des.h
dict.c
dict.h Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
error.c lavu/error: add av_make_error_string() and av_err2str() convenience utilities 2012-06-11 23:57:01 +02:00
error.h lavu/error: add av_make_error_string() and av_err2str() convenience utilities 2012-06-11 23:57:01 +02:00
eval.c The lt and lte functions were swapped. 2012-04-01 11:01:08 +02:00
eval.h
fifo.c fifo: add av_fifo_grow() 2012-05-15 18:08:32 +02:00
fifo.h fifo: add av_fifo_grow() 2012-05-15 18:08:32 +02:00
file.c
file.h
float_dsp.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
float_dsp.h Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
imgutils.c av_image_alloc: Align the width to 8 when align >= 8. 2012-04-13 18:40:17 +02:00
imgutils.h
integer.c libavutil/integer: use av_assert 2012-06-06 20:01:08 +02:00
integer.h
internal.h attributes: move av_restrict fallback from internal to attributes 2012-06-17 18:05:31 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h
intmath.h
intreadwrite.h
inverse.c
lfg.c Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
lfg.h
libavutil.v libavutil.v: add avpriv prefix 2012-06-09 02:51:02 +02:00
libm.h Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
lls.c
lls.h
log.c log: flip highlight bit for codec & muxer layer 2012-06-20 17:22:18 +02:00
log.h avutil: add get_category() for the case where one AVClass can have more than 1 category 2012-06-19 17:22:02 +02:00
lzo.c libavutil: Remove broken and pointless lzo test program. 2012-03-26 13:00:09 +02:00
lzo.h
Makefile Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
mathematics.c libavutil/mathematics: use av_assert() 2012-06-06 20:00:35 +02:00
mathematics.h Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
md5.c md5: consistently use uint32_t instead of unsigned int 2012-06-16 12:47:46 +02:00
md5.h
mem.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
mem.h
opt.c opt: add test for IMAGE_SIZE and PIXEL_FMT. 2012-06-07 22:13:59 +02:00
opt.h opt: add AV_OPT_TYPE_PIXEL_FMT. 2012-06-07 22:13:59 +02:00
parseutils.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
parseutils.h lavu/parseutils: fix specification for av_parse_time() 2012-05-18 00:38:06 +02:00
pca.c
pca.h
pixdesc.c pixdesc: BGRA64 is rgb pixel format 2012-06-08 10:42:27 +00:00
pixdesc.h pixdesc: put components always in the same order. 2012-03-21 19:01:39 +01:00
pixfmt.h lavu/pixfmt: move AVPALETTE_SIZE and _COUNT to pixfmt.h 2012-05-24 00:42:31 +02:00
qsort.h libavutil: add a merge sort. 2012-06-18 18:40:02 +02:00
random_seed.c random_seed: rewrite generic code. 2012-06-11 12:19:11 +02:00
random_seed.h
rational.c libavutil: Remove pointless rational test program. 2012-03-26 13:00:09 +02:00
rational.h
rc4.c
rc4.h
samplefmt.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
sha.c
sha.h
softfloat.c
softfloat.h
time.c av_gettime: support Win32 without gettimeofday() 2012-06-20 17:09:03 +01:00
time.h Move av_gettime() to libavutil 2012-06-20 17:09:03 +01:00
timecode.c
timecode.h timecode: move timecode muxer options to metadata. 2012-06-04 07:41:22 +02:00
timer.h
timestamp.h lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE 2012-06-10 00:37:02 +02:00
tree.c
tree.h lavu/tree: perform minor fixes to av_tree_insert() documentation 2012-05-20 16:19:36 +02:00
utils.c
x86_cpu.h