ffmpeg/libavutil
Michael Niedermayer 9f088a1ed4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegvideo: reduce excessive inlining of mpeg_motion()
  mpegvideo: convert mpegvideo_common.h to a .c file
  build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
  Move MASK_ABS macro to libavcodec/mathops.h
  x86: move MANGLE() and related macros to libavutil/x86/asm.h
  x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
  aacdec: Don't fall back to the old output configuration when no old configuration is present.
  rtmp: Add message tracking
  rtsp: Support mpegts in raw udp packets
  rtsp: Support receiving plain data over UDP without any RTP encapsulation
  rtpdec: Remove an unused include
  rtpenc: Remove an av_abort() that depends on user-supplied data
  vsrc_movie: discourage its use with avconv.
  avconv: allow no input files.
  avconv: prevent invalid reads in transcode_init()
  avconv: rename OutputStream.is_past_recording_time to finished.

Conflicts:
	configure
	doc/filters.texi
	ffmpeg.c
	ffmpeg.h
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/mpegvideo.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-09 19:31:56 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
avr32
bfin
mips
ppc
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
Makefile
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audio_fifo.c
audio_fifo.h
audioconvert.c
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h
base64.c
base64.h
blowfish.c
blowfish.h
bprint.c
bprint.h
bswap.h
colorspace.h
common.h
cpu.c
cpu.h
crc.c
crc.h
crc_data.h
des.c
des.h
dict.c
dict.h
error.c
error.h
eval.c
eval.h
fifo.c
fifo.h
file.c
file.h
float_dsp.c
float_dsp.h
imgutils.c
imgutils.h
integer.c integer: switch to av_assert 2012-08-09 01:44:15 +02:00
integer.h
internal.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
intfloat.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h
lzo.c
lzo.h
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h
opt.c
opt.h
parseutils.c
parseutils.h
pca.c
pca.h
pixdesc.c
pixdesc.h
pixfmt.h
qsort.h
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c
samplefmt.h
sha.c
sha.h
softfloat.c
softfloat.h
time.c
time.h
timecode.c lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
timecode.h lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
timer.h
timestamp.h
tree.c
tree.h
utils.c
version.h lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
x86_cpu.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
xtea.c
xtea.h