Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:24:57 +0000 (19:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:25:12 +0000 (19:25 +0200)
commitd95a04547a3238aef9a344484c9c49b5d4681ccb
tree03c4d6b7891c052fe62be27542ca51474f3034c9
parent1c8c4b8a89b91c60b6c1687241e9cbf64e8949a5
parent77fc7b76726719746ca45df6c4a62c41abad506e
Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e'

* commit '77fc7b76726719746ca45df6c4a62c41abad506e':
  vc1test: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/vc1test.c