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)
* 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>
1  2 
libavcodec/x86/h264_chromamc.asm
libavfilter/vf_fps.c
libavutil/x86/x86util.asm

Simple merge
Simple merge
Simple merge