Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 15:09:46 +0000 (16:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 15:11:02 +0000 (16:11 +0100)
commita3f30f2e995c3d72664e28a43bec41c4b13ef909
tree9efecd7da9820914fa354d31479a04ed2c745176
parent59b68ee8870ad7b831321ff39638660ac59e4a18
parent5ae72f54532960cb9eae82a1c9e8d505106c022b
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@gmx.at>
libavcodec/flashsv.c
libavcodec/h264.c
libavcodec/x86/dsputil_mmx.c