1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
FFmpeg/libavutil
Michael Niedermayer 0cb233cf46 Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
  Move x86util.asm from libavcodec/ to libavutil/.
  Move x86inc.asm to libavutil/.
  APIchanges: note error_recognition in lavf
  lavf: add support for error_recognition, use it in avidec, and bump minor API version
  avconv: change semantics of -map
  avconv: get rid of new* options.
  cmdutils: allow precisely specifying a stream for AVOptions.
  configure: add missing CFLAGS to fix building on the HURD
  libx264: Include hint for possible values for configuring libx264
  cmdutils: allow ':'-separated modifiers in option names.
  avconv: make -map_metadata work consistently with the other options
  avconv: remove deprecated options.
  avconv: make -map_chapters accept only the input file index.
  Make a copy of ffmpeg under a new name -- avconv.
  ffmpeg: add a warning stating that the program is deprecated.
  Add weighted motion compensation for RV40 B-frames
  RV3/4: calculate B-frame motion weights once per frame
  Move RV3/4-specific DSP functions into their own context
  mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
  h264: notice memory allocation failure

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	configure
	doc/ffplay.texi
	doc/ffprobe.texi
	doc/ffserver.texi
	libavcodec/libx264.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/version.h
	tests/lavf-regression.sh
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-13 02:56:08 +02:00
..
arm
avr32
bfin
mips
ppc
sh4
tomi
x86 Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
adler32.c
adler32.h
aes.c Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
aes.h
attributes.h
audioconvert.c audioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACK 2011-07-28 10:04:09 +02:00
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h audioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACK 2011-07-28 10:04:09 +02:00
base64.c
base64.h
bswap.h
colorspace.h
common.h
cpu.c
cpu.h
crc_data.h
crc.c
crc.h
des.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
des.h
dict.c
dict.h Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
error.c
error.h
eval.c Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
eval.h
fifo.c
fifo.h
file.c
file.h
imgutils.c
imgutils.h
integer.c
integer.h
internal.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c Merge remote-tracking branch 'qatar/master' 2011-07-12 01:42:32 +02:00
lls.h
log.c
log.h
lzo.c
lzo.h
Makefile Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
opt.c av_get_string: search children too. 2011-08-13 01:06:16 +02:00
opt.h
parseutils.c parseutils: add some documentation for small_strptime() 2011-07-23 17:01:28 +02:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
pca.c
pca.h
pixdesc.c Merge remote-tracking branch 'qatar/master' 2011-07-13 00:42:11 +02:00
pixdesc.h
pixfmt.h
random_seed.c Merge remote-tracking branch 'qatar/master' 2011-07-18 16:43:46 +02:00
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c
samplefmt.h
sha.c Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
sha.h
softfloat.c
softfloat.h
timer.h Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
tree.c
tree.h
utils.c
x86_cpu.h