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

(root) / coroid / ffmpeg_saccubus.git / commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 19 Jun 2011 02:02:06 +0000 (04:02 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 19 Jun 2011 02:02:06 +0000 (04:02 +0200)
commit	83f9bc8aeece0d7c5b1fadaf91118ee6a97a0390
tree	187761ffb28af7cd5ee857fa919f0d1244ffdbcf	tree \| snapshot
parent	15b4f6449ddb1f52ae82dee3f94a5b56b636cbea	commit \| diff
parent	dbafb0e06faa092f60e53d845957fbab7f2a3f2d	commit \| diff

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: prevent crash in av_open_input_file() if ap == NULL.
  more Changelog additions
  lavf: add a forgotten NULL check in convert_format_parameters().
  Fix build if yasm is not available.
  H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions.

Conflicts:
Changelog

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

Changelog	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/Makefile	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputil_mmx.c	diff1 \|	diff2 \|	blob \| history
libavformat/utils.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

About OSDN

Find Software

Develop Software

Help

Changelog	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/Makefile	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputil_mmx.c	diff1 \|	diff2 \|	blob \| history
libavformat/utils.c	diff1 \|	diff2 \|	blob \| history