[FFmpeg-cvslog] Merge commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 02:45:10 2014 +0200| [952738d0af74041c9ad8ac17f6d848a6d69fb3f1] | committer: Michael Niedermayer

Merge commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7' into release/0.10

* commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7':
  h264: set parameters from SPS whenever it changes
  alac: Limit max_samples_per_frame

Conflicts:
	libavcodec/h264.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=952738d0af74041c9ad8ac17f6d848a6d69fb3f1
---