Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 20:43:16 +0000 (22:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 20:43:16 +0000 (22:43 +0200)
commit373d7dd3716067d5151fe33b35db1aa3d1921229
tree9712979adf1cb11344e7247a63628831b5fd52e2
parent75ef907db80f77912f8e7815e75cf401dd68e2f2
parent911fa05b514e1be009e00b79d7004b93717c023b
Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'

* commit '911fa05b514e1be009e00b79d7004b93717c023b':
  mvc: Specify the pixel format for the mv-mvc* tests

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mvcdec.c
tests/fate/video.mak