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)
* commit '77fc7b76726719746ca45df6c4a62c41abad506e':
  vc1test: Return proper error codes

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

Simple merge