git.sourceforge.jp Git - coroid/ffmpeg_saccubus.git/commit

(root) / coroid / ffmpeg_saccubus.git / commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 31 Jul 2011 22:35:57 +0000 (00:35 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 31 Jul 2011 22:35:57 +0000 (00:35 +0200)
commit	335bbe424f6d21b5540230db8dadd4f42751d260
tree	db80afbc0ca61d9705fd8a30a49f9599c4b09a28	tree \| snapshot
parent	b39f872a41b92a31589052c8f914c5b52f206fd0	commit \| diff
parent	18cb40f074ec7e79b20bf9b8c8f19c55784a071c	commit \| diff

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
  x11grab: add show_region AVOption.
  x11grab: add follow_mouse AVOption.
  Do not convert RGB buffer at once when stride does not fit exact samples.

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/ffmpeg.texi	diff1 \|	diff2 \|	blob \| history
doc/indevs.texi	diff1 \|	diff2 \|	blob \| history
libavcodec/avcodec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/options.c	diff1 \|	diff2 \|	blob \| history
libavcodec/version.h	diff1 \|	diff2 \|	blob \| history
libavdevice/x11grab.c	diff1 \|	diff2 \|	blob \| history
libswscale/swscale_unscaled.c	diff1 \|	diff2 \|	blob \| history

さきゅばす/いんきゅばす用ffmpeg

RSS Atom

About OSDN

Find Software

Develop Software

Help

doc/ffmpeg.texi	diff1 \|	diff2 \|	blob \| history
doc/indevs.texi	diff1 \|	diff2 \|	blob \| history
libavcodec/avcodec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/options.c	diff1 \|	diff2 \|	blob \| history
libavcodec/version.h	diff1 \|	diff2 \|	blob \| history
libavdevice/x11grab.c	diff1 \|	diff2 \|	blob \| history
libswscale/swscale_unscaled.c	diff1 \|	diff2 \|	blob \| history