merge decl & init
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2008 22:55:39 +0000 (22:55 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2008 22:55:39 +0000 (22:55 +0000)
commitad9c10556c5ed9eb17d8412c1414048fdfe5fc44
tree0681c46251a71db47583dff1e1839c7093cbe4d8
parenta4fe6826de5925020cd2c06a0f2f84b8bf3430da
merge decl & init

Originally committed as revision 14001 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/psxstr.c