Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:36:46 +0000 (21:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:36:46 +0000 (21:36 +0200)
commit29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b
treebb18645d9cb88a670f3fb980cdcf4478142cf564
parent2dbda9378c1e60d9f8b11ca0d1b3113a01e39742
parent746ad4e0df7faf93329804e412ec53c1d929a75b
Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'

* commit '746ad4e0df7faf93329804e412ec53c1d929a75b':
  dct-test: Improve CPU flags struct member name

Conflicts:
libavcodec/dct-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dct-test.c