[FFmpeg-cvslog] Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 26 16:09:46 2012 +0100| [a3f30f2e995c3d72664e28a43bec41c4b13ef909] | committer: Michael Niedermayer

Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b'

* commit '5ae72f54532960cb9eae82a1c9e8d505106c022b':
  flashsv: check for keyframe before using differential coding
  h264: enable low delay only if no delayed frames were seen
  x86: fix build without inline asm

Conflicts:
	libavcodec/h264.c

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

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