]> git.sesse.net Git - ffmpeg/commit
Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 10:44:23 +0000 (11:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 10:44:45 +0000 (11:44 +0100)
commit68f92a70f1f486c8bc01a1e747a017a6f8dd6861
treeb89449f185b6cb80450e019ab61ed978f1c47047
parentf245a2086a10327d0fd5ffd0500721729017c772
parentdae1d507af94261bafd3b11549884e5d1eca590e
Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'

* commit 'dae1d507af94261bafd3b11549884e5d1eca590e':
  x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
  vf_fps: add final flushed frames to the dropped frame count
  rv34_parser: Adjust #if for disabling individual parsers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/h264_chromamc.asm
libavfilter/vf_fps.c
libavutil/x86/x86util.asm