Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jun 2011 02:02:06 +0000 (04:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jun 2011 02:02:06 +0000 (04:02 +0200)
commit83f9bc8aeece0d7c5b1fadaf91118ee6a97a0390
tree187761ffb28af7cd5ee857fa919f0d1244ffdbcf
parent15b4f6449ddb1f52ae82dee3f94a5b56b636cbea
parentdbafb0e06faa092f60e53d845957fbab7f2a3f2d
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
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavformat/utils.c