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

(root) / coroid / ffmpeg_saccubus.git / commit

author	Michael Niedermayer <michaelni@gmx.at>
	Thu, 7 Jul 2011 23:05:28 +0000 (01:05 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Thu, 7 Jul 2011 23:05:28 +0000 (01:05 +0200)
commit	5d1b39f7e7381a2e837b9b6d43dede7de528da3c
tree	5d0f96c4324c637d436e1aaf2f45aee1eb9f99b6	tree \| snapshot
parent	ebd1edf36c81155e2817edaa056b0bc9eb21e8f5	commit \| diff
parent	2f138f0b7c36fe50b51e0d74bc913d14aea00c5e	commit \| diff

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: clean up library installation rules
  vf_drawtext: Remove some write-only variables.
  libgsm: Drop const qualifier to silence compiler warning.
  docs: Remove needless configure options
  docs: Don't recommend adding --enable-memalign-hack
  libvo-amrwbenc: Add braces to shut up gcc warning.
  adts: Fix PCE copying.

Conflicts:
configure
doc/general.texi
subdir.mak

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

configure	diff1 \|	diff2 \|	blob \| history
doc/general.texi	diff1 \|	diff2 \|	blob \| history
libavcodec/libgsm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libvo-amrwbenc.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_drawtext.c	diff1 \|	diff2 \|	blob \| history
libavformat/adtsenc.c	diff1 \|	diff2 \|	blob \| history
subdir.mak	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

About OSDN

Find Software

Develop Software

Help

configure	diff1 \|	diff2 \|	blob \| history
doc/general.texi	diff1 \|	diff2 \|	blob \| history
libavcodec/libgsm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libvo-amrwbenc.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_drawtext.c	diff1 \|	diff2 \|	blob \| history
libavformat/adtsenc.c	diff1 \|	diff2 \|	blob \| history
subdir.mak	diff1 \|	diff2 \|	blob \| history