ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 06:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
e5d617aa6d
FFmpeg/libavutil
History
Michael Niedermayer 706bd8ea19 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  h264_idct_10bit: port x86 assembly to cpuflags.
  x86inc: clip num_args to 7 on x86-32.
  x86inc: sync to latest version from x264.
  fft: rename "z" to "zc" to prevent name collision.
  wv: return meaningful error codes.
  wv: return AVERROR_EOF on EOF, not EIO.
  mp3dec: forward errors for av_get_packet().
  mp3dec: remove a pointless local variable.
  mp3dec: remove commented out cruft.
  lavfi: bump minor to mark stabilizing the ABI.
  FATE: add tests for yadif.
  FATE: add a test for delogo video filter.
  FATE: add a test for amix audio filter.
  audiogen: allow specifying random seed as a commandline parameter.
  vc1dec: Override invalid macroblock quantizer
  vc1: avoid reading beyond the last line in vc1_draw_sprites()
  vc1dec: check that coded slice positions and interlacing match.
  vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value
  configure: Move parts that should not be user-selectable to CONFIG_EXTRA
  lavf: remove commented out cruft in avformat_find_stream_info()
  ...

Conflicts:
	Makefile
	configure
	libavcodec/vc1dec.c
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264_deblock_10bit.asm
	libavcodec/x86/h264dsp_mmx.c
	libavfilter/version.h
	libavformat/mp3dec.c
	libavformat/utils.c
	libavformat/wv.c
	libavutil/x86/x86inc.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-29 02:16:26 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
avr32
bfin
mips replace all __volatile__ by volatile 2012-07-11 04:04:29 +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-07-29 02:16:26 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h lavu: disable av_uninit for clang 2012-07-16 19:30:13 +00: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 Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
base64.c
base64.h
blowfish.c Blowfish: restructure/simplify code a bit. 2012-07-06 02:25:29 +02:00
blowfish.h blowfish.h: include author attribution 2012-07-04 23:23:17 +02:00
bprint.c bprint: implement vsnprintf for win32. 2012-06-14 13:54:00 +02:00
bprint.h lavu/bprint: extend/clarify documentation for av_bprint_init() size_max value 2012-07-28 10:49:08 +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 Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
cpu.h Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +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-07-04 00:32:31 +02:00
error.c error: define AVERROR_EXTERNAL. 2012-07-04 15:45:05 +02:00
error.h error: define AVERROR_EXTERNAL. 2012-07-04 15:45:05 +02:00
eval.c Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +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 Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
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 imgutils: Fix warnings about incompatible pointer type and discarded qualifiers 2012-07-27 22:10:10 +02:00
imgutils.h lavu/imgutils: create misc functions for dealing with buffers 2012-06-26 13:12:12 +02:00
integer.c libavutil/integer: use av_assert 2012-06-06 20:01:08 +02:00
integer.h
internal.h Merge remote-tracking branch 'qatar/master' 2012-07-10 20:51:51 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h intfloat: Don't use designated initializers in the public headers 2012-07-02 14:05:40 +03:00
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 Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
lls.c
lls.h
log.c log: fix compilation failure on mingw due to reference to undefined set_color256 2012-07-07 12:57:13 +02:00
log.h lavu: 256 color support 2012-07-07 01:41:55 +00:00
lzo.c
lzo.h
Makefile Install libavutil/version.h 2012-07-05 08:21:49 +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-07-01 22:43:09 +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 mem: Don't abort on av_malloc(0) in debug mode 2012-07-10 11:37:03 +03:00
mem.h Merge remote-tracking branch 'qatar/master' 2012-07-16 01:32:52 +02:00
opt.c Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
opt.h opt: add AV_OPT_TYPE_PIXEL_FMT. 2012-06-07 22:13:59 +02:00
parseutils.c parseutils: ignore digits below the microsecond. 2012-07-10 22:29:08 +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 libavutil: add 12 and 14 bit planar colorspaces 2012-07-03 19:02:34 +02:00
pixdesc.h pixdesc: fix project reference in comment 2012-06-29 11:23:56 +02:00
pixfmt.h cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
qsort.h qsort: flip compare direction to match libc qsort() 2012-06-22 22:48:00 +02:00
random_seed.c random_seed: Only read /dev/*random if we have unistd.h 2012-06-29 15:52:07 +03:00
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c av_samples_copy: support overlapping copies 2012-07-12 22:25:25 +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 Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
time.h Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
timecode.c avutil: support 50 and 60 frame rates in timecode api 2012-07-27 13:41:58 +02:00
timecode.h avutil: support 50 and 60 frame rates in timecode api 2012-07-27 13:41:58 +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
version.h avutil: support 50 and 60 frame rates in timecode api 2012-07-27 13:41:58 +02:00
x86_cpu.h
xtea.c Merge remote-tracking branch 'qatar/master' 2012-07-05 21:55:31 +02:00
xtea.h xtea.h: include author attribution 2012-07-04 23:23:09 +02:00