Merge commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:04:04 +0000 (22:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:04:04 +0000 (22:04 +0100)
* commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa':
  x86: Add CPU flag for the i686 cmov instruction

Conflicts:
doc/APIchanges
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c

diff --cc doc/APIchanges
@@@ -13,15 -13,9 +13,18 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
+ 2014-09-16 - xxxxxxx - lavu 51.22.3 - cpu.h
+   Add AV_CPU_FLAG_CMOV.
 +2012-01-24 - xxxxxxx - lavfi 2.60.100
 +  Add avfilter_graph_dump.
 +
 +2012-01-25 - lavf 53.31.100 / 53.22.0
 +  3c5fe5b / f1caf01 Allow doing av_write_frame(ctx, NULL) for flushing possible
 +          buffered data within a muxer. Added AVFMT_ALLOW_FLUSH for
 +          muxers supporting it (av_write_frame makes sure it is called
 +          only for muxers with this flag).
 +
  2012-03-04 - 7f3f855 - lavu 51.22.1 - error.h
    Add AVERROR_UNKNOWN
  
diff --cc libavutil/cpu.c
Simple merge
diff --cc libavutil/cpu.h
Simple merge
Simple merge