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>

diff --cc Changelog
index 7840e09,a504449..975c3d4
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -2,13 -2,8 +2,13 @@@ Entries are sorted chronologically fro
  releases are sorted from youngest to oldest.
  
  
- version <next>:
+ version 0.7:
  
 +- many many things we forgot because we rather write code than changelogs
 +- libmpcodecs video filter support (3 times as many filters than before)
 +- mpeg2 aspect ratio dection fixed
 +- libxvid aspect pickiness fixed
 +- Frame multithreaded decoding
  - E-AC-3 audio encoder
  - ac3enc: add channel coupling support
  - floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
@@@ -18,17 -15,14 +20,19 @@@
  
  version 0.7_beta2:
  
+ - VP8 frame-multithreading
+ - NEON optimizations for VP8
  - Lots of deprecated API cruft removed
  - fft and imdct optimizations for AVX (Sandy Bridge) processors
 +- showinfo filter added
  - DPX image encoder
  - SMPTE 302M AES3 audio decoder
 -- Remove support for quitting ffmpeg with 'q', ctrl+c should be used.
 +- Apple Core Audio Format muxer
- - 9bit and 10bit H.264 decoding
+ - 9bit and 10bit per sample support in the H.264 decoder
 +- 9bit and 10bit FFV1 encoding / decoding
 +- split filter added
 +- select filter added
 +- sdl output device added
  
  
  version 0.7_beta1:

diff --cc libavcodec/x86/Makefile
Simple merge

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libavformat/utils.c
Simple merge